From 61aeae445d4bb1b1cb30fa0b46e59278cd33b7c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Boros?= Date: Fri, 1 Mar 2019 17:51:06 +0100 Subject: [PATCH 1/4] Fixing pypi upload --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 493869bc..a80bc19e 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ install-db: upload-coverage: @sh scripts/upload-coverage.sh -upload-pypi: +upload-pypi: prepare @sh scripts/upload-pypi.sh clean: From 941144392b69ed0e0bffdf486d1f6b300ce0aa9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Boros?= Date: Fri, 1 Mar 2019 18:31:06 +0100 Subject: [PATCH 2/4] Fixing regexp to find patch group as well --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 56c35f43..f668cdab 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ from rethinkdb.version import VERSION RETHINKDB_VERSION_DESCRIBE = os.environ.get("RETHINKDB_VERSION_DESCRIBE") -VERSION_RE = r"^v(?P\d+\.\d+)\.0(-(?P\d+))?(-(?P\w+))?$" +VERSION_RE = r"^v(?P\d+\.\d+)\.(?P\d+)?(-(?P\w+))?$" if RETHINKDB_VERSION_DESCRIBE: MATCH = re.match(VERSION_RE, RETHINKDB_VERSION_DESCRIBE) From 69f3be62f335317cfcf0ed5549bb984f90c2e640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Boros?= Date: Fri, 1 Mar 2019 18:43:05 +0100 Subject: [PATCH 3/4] Remove SHA part from the regexp due. Can't use PEP 440 local versions --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.py b/setup.py index f668cdab..f2534fd1 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ from rethinkdb.version import VERSION RETHINKDB_VERSION_DESCRIBE = os.environ.get("RETHINKDB_VERSION_DESCRIBE") -VERSION_RE = r"^v(?P\d+\.\d+)\.(?P\d+)?(-(?P\w+))?$" +VERSION_RE = r"^v(?P\d+\.\d+)\.(?P\d+)?$" if RETHINKDB_VERSION_DESCRIBE: MATCH = re.match(VERSION_RE, RETHINKDB_VERSION_DESCRIBE) @@ -39,8 +39,6 @@ VERSION = MATCH.group("version") if MATCH.group("patch"): VERSION += "." + MATCH.group("patch") - if MATCH.group("sha"): - VERSION += "+" + MATCH.group("sha").lower() with open("rethinkdb/version.py", "w") as ostream: print("# Autogenerated version", file=ostream) From 602ae2441cc7bcd833c0caae7ebb9b682bc8f637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Boros?= Date: Fri, 1 Mar 2019 19:01:25 +0100 Subject: [PATCH 4/4] Add post release capability --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f2534fd1..ac191ff3 100644 --- a/setup.py +++ b/setup.py @@ -30,16 +30,20 @@ from rethinkdb.version import VERSION RETHINKDB_VERSION_DESCRIBE = os.environ.get("RETHINKDB_VERSION_DESCRIBE") -VERSION_RE = r"^v(?P\d+\.\d+)\.(?P\d+)?$" +VERSION_RE = r"^v(?P\d+\.\d+)\.(?P\d+)?(\.(?P\w+))?$" if RETHINKDB_VERSION_DESCRIBE: MATCH = re.match(VERSION_RE, RETHINKDB_VERSION_DESCRIBE) if MATCH: VERSION = MATCH.group("version") + if MATCH.group("patch"): VERSION += "." + MATCH.group("patch") + if MATCH.group("post"): + VERSION += "." + MATCH.group("post") + with open("rethinkdb/version.py", "w") as ostream: print("# Autogenerated version", file=ostream) print(file=ostream)