Merge branch 'master' into add-scripts-for-updating-discovery-artifacts-using-github-action

Author: parthea

noxfile.py

@@ -17,6 +17,8 @@
 import sys
 
 import nox
+import os
+import shutil
 
 test_dependencies = [
     "django>=2.0.0",
@@ -59,9 +61,22 @@ def lint(session):
     ],
 )
 def unit(session, oauth2client):
+    # Clean up dist and build folders
+    shutil.rmtree('dist', ignore_errors=True)
+    shutil.rmtree('build', ignore_errors=True)
+
     session.install(*test_dependencies)
     session.install(oauth2client)
-    session.install('.')
+
+    # Create and install wheels
+    session.run('python3', 'setup.py', 'bdist_wheel')
+    session.install(os.path.join('dist', os.listdir('dist').pop()))
+
+    # Run tests from a different directory to test the package artifacts
+    root_dir = os.path.dirname(os.path.realpath(__file__))
+    temp_dir = session.create_tmp()
+    session.chdir(temp_dir)
+    shutil.copytree(os.path.join(root_dir, 'tests'), 'tests')
 
     # Run py.test against the unit tests.
     session.run(

setup.py

@@ -27,7 +27,22 @@
 
 import io
 import os
-from setuptools import setup
+import setuptools
+
+# Disable version normalization performed by setuptools.setup()
+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
 
 packages = ["apiclient", "googleapiclient", "googleapiclient/discovery_cache"]
 
@@ -48,9 +63,9 @@
 
 version = "2.2.0"
 
-setup(
+setuptools.setup(
     name="google-api-python-client",
-    version=version,
+    version=sic(version),
     description="Google API Client Library for Python",
     long_description=readme,
     long_description_content_type='text/markdown',