From 7fddcc689c958903159c31d07f50526a888a19d3 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Tue, 12 Nov 2019 15:26:24 +0100 Subject: [PATCH] Generate valid version number with setup.py patch_version The extra version information must be a valid local version identifier (see https://www.python.org/dev/peps/pep-0440/#local-version-identifiers) --- picard/__init__.py | 2 +- scripts/package/macos-package-app.sh | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/picard/__init__.py b/picard/__init__.py index 7fba8488f..ca08a9d31 100644 --- a/picard/__init__.py +++ b/picard/__init__.py @@ -79,7 +79,7 @@ def version_from_string(version_str): PICARD_VERSION_STR = version_to_string(PICARD_VERSION) PICARD_VERSION_STR_SHORT = version_to_string(PICARD_VERSION, short=True) if PICARD_BUILD_VERSION_STR: - __version__ = "%s_%s" % (PICARD_VERSION_STR, PICARD_BUILD_VERSION_STR) + __version__ = "%s+%s" % (PICARD_VERSION_STR, PICARD_BUILD_VERSION_STR) PICARD_FANCY_VERSION_STR = "%s (%s)" % (PICARD_VERSION_STR_SHORT, PICARD_BUILD_VERSION_STR) else: diff --git a/scripts/package/macos-package-app.sh b/scripts/package/macos-package-app.sh index d86d53475..c40e73450 100755 --- a/scripts/package/macos-package-app.sh +++ b/scripts/package/macos-package-app.sh @@ -3,7 +3,7 @@ set -e if [ -z "$TRAVIS_TAG" ] then - python3 setup.py patch_version --platform=osx_$TRAVIS_OSX_IMAGE + python3 setup.py patch_version --platform=osx.$TRAVIS_OSX_IMAGE fi VERSION=$(python3 -c 'import picard; print(picard.__version__)') diff --git a/setup.py b/setup.py index c0a92adfa..5e912f826 100644 --- a/setup.py +++ b/setup.py @@ -626,7 +626,7 @@ class picard_patch_version(Command): regex = re.compile(r'^PICARD_BUILD_VERSION_STR\s*=.*$', re.MULTILINE) with open(filename, 'r+b') as f: source = (f.read()).decode() - build = self.platform + '_' + datetime.datetime.utcnow().strftime('%Y%m%d%H%M%S') + build = self.platform + '.' + datetime.datetime.utcnow().strftime('%Y%m%d%H%M%S') patched_source = regex.sub('PICARD_BUILD_VERSION_STR = "%s"' % build, source).encode() f.seek(0) f.write(patched_source)