From e0b752be8f99df9979293a63fc00fa8c32ba58eb Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Sat, 27 Apr 2019 15:07:00 +0200 Subject: [PATCH] Move release version management to make stage ... to ensure setup.py does not trip some later time. Fixes mnauw/git-remote-hg#25 --- Makefile | 2 ++ setup.py | 9 +-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 841d261..8cb2be5 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,8 @@ install-doc: doc install -m 644 doc/git-remote-hg.1 $(D)$(mandir)/git-remote-hg.1 pypi: + version=`git describe --tags ${REV}` && \ + sed -i "s/version = .*/version = '$$version'/" setup.py -rm -rf dist build python setup.py sdist bdist_wheel diff --git a/setup.py b/setup.py index 26afd17..94b5bea 100644 --- a/setup.py +++ b/setup.py @@ -5,15 +5,8 @@ import subprocess import sys import os -# derive version from git repo -cmd = ["git", "describe", "--tags"] -commit = os.environ.get('REV', None) -if commit: - cmd.append(commit) -process = subprocess.Popen(cmd, stdout=subprocess.PIPE) -version = process.communicate()[0].strip() # strip leading v -version = version[1:] +version = 'v1.0.0' # check for released version assert (len(version) > 0)