Skip to content

chore: prevent normalization of semver versioning #736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
busunkim96 merged 5 commits into from
Apr 16, 2021
Merged

chore: prevent normalization of semver versioning #736

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
510de87
chore: prevent normalization of semver versioning
dandhlee Apr 14, 2021
4b3f521
chore: bump setuptools version and fix for style
dandhlee Apr 15, 2021
7e9509e
chore: update workaround to make sic work
dandhlee Apr 16, 2021
bac40f9
Merge branch 'master' into remove-semver-normalization
dandhlee Apr 16, 2021
1f10f96
chore: loosen setuptools version for Python2
dandhlee Apr 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,24 @@
import io
import os

from setuptools import find_packages
from setuptools import setup
import setuptools

# Disable version normalization performed by setuptools.setup()
# Adding this in even though it works for Python3.x, but does not
# work for Python 2.7
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
Copy link
Contributor

@parthea parthea Apr 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of the workaround, let's bump the setuptools version since it's a dependency.
https://github.com/googleapis/google-auth-library-python/blob/master/setup.py#L29

Copy link
Contributor Author

@dandhlee dandhlee Apr 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried doing that, it works for Python3 but does not work for Python2 :(

Copy link
Contributor

@busunkim96 busunkim96 Apr 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah it must be from setuptools removing support for Python 2. This LGTM.


DEPENDENCIES = (
"cachetools>=2.0.0,<5.0",
Expand Down Expand Up @@ -46,15 +61,15 @@
exec(fp.read(), version)
version = version["__version__"]

setup(
setuptools.setup(
name="google-auth",
version=version,
version=sic(version),
author="Google Cloud Platform",
author_email="googleapis-packages@google.com",
description="Google Authentication Library",
long_description=long_description,
url="https://github.com/googleapis/google-auth-library-python",
packages=find_packages(exclude=("tests*", "system_tests*")),
packages=setuptools.find_packages(exclude=("tests*", "system_tests*")),
namespace_packages=("google",),
install_requires=DEPENDENCIES,
extras_require=extras,
Expand Down