From 3b00b9cb12afa097e55f51167614f0985816a482 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Sun, 11 Sep 2011 11:24:12 -0300 Subject: [PATCH] added support for generating version from git revision --- extras/makedeb.py | 4 +++- setup.py | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/extras/makedeb.py b/extras/makedeb.py index 054204cf2..63410b2df 100644 --- a/extras/makedeb.py +++ b/extras/makedeb.py @@ -16,7 +16,9 @@ def build(suffix): with open(ifn, 'w') as of: of.write(s) - check_call('debchange -m -D unstable --force-distribution -v $(python setup.py --version)-r$(hg tip --template "{rev}")+$(date +%s) "Automatic build"', shell=True) + env={'SCRAPY_VERSION_FROM_GIT': '1'} + check_call('debchange -m -D unstable --force-distribution -v $(python setup.py --version)+$(date +%s) "Automatic build"', \ + shell=True, env=env) check_call('debuild -us -uc -b', shell=True) def clean(suffix): diff --git a/setup.py b/setup.py index e542cb65a..04d37f23c 100644 --- a/setup.py +++ b/setup.py @@ -86,6 +86,10 @@ if os.environ.get('SCRAPY_VERSION_FROM_HG'): rev = Popen(["hg", "tip", "--template", "{rev}"], stdout=PIPE).communicate()[0] with open('scrapy/__init__.py', 'a') as f: f.write("\n__version__ = '.'.join(map(str, version_info)) + '.%s'" % rev) +elif os.environ.get('SCRAPY_VERSION_FROM_GIT'): + rev = Popen("git log --oneline | wc -l", shell=True, stdout=PIPE).communicate()[0] + with open('scrapy/__init__.py', 'a') as f: + f.write("\n__version__ = '.'.join(map(str, version_info)) + '.%s'" % rev.strip()) version = __import__('scrapy').__version__ setup_args = {