From b033ca051383195fd2c2851ffd7b915bc797dd55 Mon Sep 17 00:00:00 2001 From: Dan Lee <71398022+dandhlee@users.noreply.github.com> Date: Wed, 14 Apr 2021 19:29:56 -0400 Subject: [PATCH 1/3] chore: prevent normalization of semver versioning --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5de5aafb..37af9226 100644 --- a/setup.py +++ b/setup.py @@ -74,7 +74,7 @@ setuptools.setup( name=name, - version=version, + version=setuptools.sic(version), description=description, long_description=readme, author="Google LLC", From 47962bd60a6abe9aa906e4cf112b6a4316659687 Mon Sep 17 00:00:00 2001 From: Dan Lee <71398022+dandhlee@users.noreply.github.com> Date: Fri, 16 Apr 2021 00:51:49 -0400 Subject: [PATCH 2/3] chore: update workaround to make sic work --- setup.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 37af9226..12f14b57 100644 --- a/setup.py +++ b/setup.py @@ -17,6 +17,21 @@ import setuptools +# Disable version normalization performed by setuptools.setup() +# Including this workaround for Python2.7 support +try: + # Try the approach of using sic(), added in setuptools 46.1.0 + from setuptools import sic +except ImportError: + # Try the approach of replacing packaging.version.Version + sic = lambda v: v + try: + # setuptools >=39.0.0 uses packaging from setuptools.extern + from setuptools.extern import packaging + except ImportError: + # setuptools <39.0.0 uses packaging from pkg_resources.extern + from pkg_resources.extern import packaging + packaging.version.Version = packaging.version.LegacyVersion # Package metadata. @@ -33,7 +48,7 @@ "protobuf >= 3.12.0", "google-auth >= 1.21.1, < 2.0dev", "requests >= 2.18.0, < 3.0.0dev", - "setuptools >= 40.3.0", + "setuptools >= 46.1.0", "packaging >= 14.3", "six >= 1.13.0", "pytz", @@ -74,7 +89,7 @@ setuptools.setup( name=name, - version=setuptools.sic(version), + version=sic(version), description=description, long_description=readme, author="Google LLC", From 452f4cdd6080716ddc5dd1fece3b60eaaf9b383f Mon Sep 17 00:00:00 2001 From: Dan Lee <71398022+dandhlee@users.noreply.github.com> Date: Fri, 16 Apr 2021 02:04:33 -0400 Subject: [PATCH 3/3] chore: loosening setuptools 46.x for Python2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 12f14b57..9bdb4ef2 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ "protobuf >= 3.12.0", "google-auth >= 1.21.1, < 2.0dev", "requests >= 2.18.0, < 3.0.0dev", - "setuptools >= 46.1.0", + "setuptools >= 40.3.0", "packaging >= 14.3", "six >= 1.13.0", "pytz",