8000 Reference dev version of webassets in setup.py. · woodcoder/flask-assets@2fba71b · GitHub
[go: up one dir, main page]

Skip to content

Commit 2fba71b

Browse files
committed
Reference dev version of webassets in setup.py.
Releases will reference the release.
1 parent 8c7fc94 commit 2fba71b

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

setup.py

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,27 @@
1313
# Figure out the version; this could be done by importing the
1414
# module, though that requires dependencies to be already installed,
1515
# which may not be the case when processing a pip requirements
16-
# file, for example.a
17-
import os, re
18-
here = os.path.dirname(os.path.abspath(__file__))
19-
version_re = re.compile(
20-
r'__version__ = (\(.*?\))')
21-
fp = open(os.path.join(here, 'src', 'flask_assets.py'))
22-
version = None
23-
for line in fp:
24-
match = version_re.search(line)
25-
if match:
26-
version = eval(match.group(1))
27-
break
28-
else:
29-
raise Exception("cannot find version")
30-
fp.close()
16+
# file, for example.
17+
def parse_version(asignee):
18+
import os, re
19+
here = os.path.dirname(os.path.abspath(__file__))
20+
version_re = re.compile(
21+
r'__version__ = (\(.*?\))')
22+
with open(os.path.join(here, 'src', 'flask_assets.py')) as fp:
23+
for line in fp:
24+
match = version_re.search(line)
25+
if match:
26+
version = eval(match.group(1))
27+
return ".".join(map(str, version))
28+
else:
29+
raise Exception("cannot find version")
30+
version = parse_version('__version__')
31+
webassets_version = parse_version('__webassets_version__')
3132

3233

3334
setup(
3435
name='Flask-Assets',
35-
version=".".join(map(str, version)),
36+
version=version,
3637
url='http://github.com/miracle2k/flask-assets',
3738
license='BSD',
3839
author='Michael Elsdoerfer',
@@ -46,7 +47,7 @@
4647
platforms='any',
4748
install_requires=[
4849
'Flask>=0.8',
49-
'webassets==0.6',
50+
'webassets==%s' % webassets_version,
5051
],
5152
classifiers=[
5253
'Environment :: Web Environment',

src/flask_assets.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66

77
__version__ = (0, 7, 'dev')
8+
__webassets_version__ = ('dev',) # webassets core compatibility. used in setup.py
9+
810

911
__all__ = ('Environment', 'Bundle',)
1012

0 commit comments

Comments
 (0)
0