From f13bb771cda658e9c817ba608604c905a0bf7cd2 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 12 Nov 2019 00:04:40 +0100 Subject: [PATCH] Provide a separate version for PyPI inside version.sh --- setup.py | 4 ++-- version.sh | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 268ea6977..c24926061 100644 --- a/setup.py +++ b/setup.py @@ -333,10 +333,10 @@ class Config(object): version_file = os.path.join(os.path.dirname(__file__), "version.sh") with open(version_file, "r") as file: version_txt = file.read() - rm = re.search(r"KLAYOUT_VERSION\s*=\s*\"(.*?)\".*", version_txt) + rm = re.search(r"KLAYOUT_PYPI_VERSION\s*=\s*\"(.*?)\".*", version_txt) if rm: version_string = rm.group(1) - print("KLAYOUT_VERSION = " + version_string) + print("KLAYOUT_PYPI_VERSION = " + version_string) return version_string raise RuntimeError("Unable to obtain version string from version.sh") diff --git a/version.sh b/version.sh index 5c7d65ca0..2b19e1d68 100644 --- a/version.sh +++ b/version.sh @@ -4,6 +4,9 @@ # The main version KLAYOUT_VERSION="0.26.1" +# The version used for PyPI (don't use variables here!) +KLAYOUT_VERSION="0.26.1r1" + # The build date KLAYOUT_VERSION_DATE=$(date "+%Y-%m-%d")