From 9ba49d7dca1dd7ed406142070f18769d8e6573f5 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Tue, 7 Jul 2020 17:46:56 +0000 Subject: [PATCH 1/8] chore(deps)!: require 3.5+ --- README.md | 3 --- noxfile.py | 8 +++----- setup.py | 14 ++------------ 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 0fae27dad95..766533f605f 100644 --- a/README.md +++ b/README.md @@ -50,9 +50,6 @@ virtualenv Python 3.5, 3.6 and 3.7, and 3.8 are fully supported and tested. This library may work on later versions of 3, but we do not currently run tests against those versions -## Deprecated Python Versions - -Python == 2.7 ## Third Party Libraries and Dependencies diff --git a/noxfile.py b/noxfile.py index 1f95edfdca9..931c4a8ea14 100644 --- a/noxfile.py +++ b/noxfile.py @@ -44,7 +44,7 @@ def lint(session): ) -@nox.session(python=["2.7", "3.5", "3.6", "3.7", "3.8"]) +@nox.session(python=["3.6", "3.7", "3.8", "3.9"]) @nox.parametrize( "oauth2client", [ @@ -54,13 +54,11 @@ def lint(session): "oauth2client>=4,<=5dev", ], ) +@nox.session(python=["3.6", "3.7", "3.8", "3.9"]) def unit(session, oauth2client): session.install(*test_dependencies) session.install(oauth2client) - if session.python < "3.0": - session.install("django<2.0.0") - else: - session.install("django>=2.0.0") + session.install("django>=2.0.0") session.install('.') diff --git a/setup.py b/setup.py index 33f7e5a1365..19ee049d051 100644 --- a/setup.py +++ b/setup.py @@ -19,15 +19,6 @@ """ from __future__ import print_function -import sys - -if sys.version_info < (2, 7): - print("google-api-python-client requires python version >= 2.7.", file=sys.stderr) - sys.exit(1) -if (3, 1) <= sys.version_info < (3, 4): - print("google-api-python-client requires python3 version >= 3.4.", file=sys.stderr) - sys.exit(1) - import io import os from setuptools import setup @@ -61,18 +52,17 @@ author_email="googleapis-packages@google.com", url="https://github.com/googleapis/google-api-python-client/", install_requires=install_requires, - python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*", + python_requires=">=3.5", packages=packages, package_data={}, license="Apache 2.0", keywords="google api client", classifiers=[ - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License", From 9e26b64acb9451cc76e0e826e411fec4f4c6035c Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Wed, 9 Dec 2020 16:01:53 +0000 Subject: [PATCH 2/8] address review comments --- README.md | 5 ++++- setup.py | 12 ++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 766533f605f..27819121c2a 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,11 @@ virtualenv ## Supported Python Versions -Python 3.5, 3.6 and 3.7, and 3.8 are fully supported and tested. This library may work on later versions of 3, but we do not currently run tests against those versions +Python 3.6 and 3.7, and 3.8 are fully supported and tested. This library may work on later versions of 3, but we do not currently run tests against those versions +## Unsupported Python Versions + +Python == 2.7 ## Third Party Libraries and Dependencies diff --git a/setup.py b/setup.py index 19ee049d051..af93f67053c 100644 --- a/setup.py +++ b/setup.py @@ -19,6 +19,15 @@ """ from __future__ import print_function +import sys + +if sys.version_info < (2, 7): + print("google-api-python-client requires python version >= 2.7.", file=sys.stderr) + sys.exit(1) +if (3, 1) <= sys.version_info < (3, 6): + print("google-api-python-client requires python3 version >= 3.6.", file=sys.stderr) + sys.exit(1) + import io import os from setuptools import setup @@ -52,14 +61,13 @@ author_email="googleapis-packages@google.com", url="https://github.com/googleapis/google-api-python-client/", install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.6", packages=packages, package_data={}, license="Apache 2.0", keywords="google api client", classifiers=[ "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", From e4798aea7a06cb3cec4a17a5c484fb5d5a01da03 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Wed, 9 Dec 2020 16:02:37 +0000 Subject: [PATCH 3/8] fix: fix version comp --- setup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py index af93f67053c..a0d9cc7fb1d 100644 --- a/setup.py +++ b/setup.py @@ -21,10 +21,7 @@ import sys -if sys.version_info < (2, 7): - print("google-api-python-client requires python version >= 2.7.", file=sys.stderr) - sys.exit(1) -if (3, 1) <= sys.version_info < (3, 6): +if sys.version_info < (3, 6): print("google-api-python-client requires python3 version >= 3.6.", file=sys.stderr) sys.exit(1) From 39d0ed0cc5374622221c2bf7eb639d5dd5c1b0dd Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Wed, 9 Dec 2020 16:04:57 +0000 Subject: [PATCH 4/8] feat: add 3.9 --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index a0d9cc7fb1d..d2f7268c7d0 100644 --- a/setup.py +++ b/setup.py @@ -68,6 +68,7 @@ "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License", From 51ff8686228002dc2f8a0524a7265658cc39c1e6 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Wed, 9 Dec 2020 16:05:51 +0000 Subject: [PATCH 5/8] docs: clean up README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 27819121c2a..5c9ea9dcb43 100644 --- a/README.md +++ b/README.md @@ -50,9 +50,9 @@ virtualenv Python 3.6 and 3.7, and 3.8 are fully supported and tested. This library may work on later versions of 3, but we do not currently run tests against those versions -## Unsupported Python Versions +## Unsupported Python Versions -Python == 2.7 +Python < 3.6 ## Third Party Libraries and Dependencies From 2f2000b27787324531d526a42fe2b0493808b8d6 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Wed, 9 Dec 2020 16:11:56 +0000 Subject: [PATCH 6/8] fix: fix noxfile --- noxfile.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/noxfile.py b/noxfile.py index 931c4a8ea14..dda647cec4c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -16,6 +16,7 @@ import nox test_dependencies = [ + "django>=2.0.0", "google-auth", "google-auth-httplib2", "mox", @@ -54,12 +55,9 @@ def lint(session): "oauth2client>=4,<=5dev", ], ) -@nox.session(python=["3.6", "3.7", "3.8", "3.9"]) def unit(session, oauth2client): session.install(*test_dependencies) session.install(oauth2client) - session.install("django>=2.0.0") - session.install('.') # Run py.test against the unit tests. From 162fa505aad57d53591a4cfa8ad1a6a9688d5394 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Wed, 9 Dec 2020 16:35:08 +0000 Subject: [PATCH 7/8] docs: add 3.9 to README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c9ea9dcb43..07e64d24e5f 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ virtualenv ## Supported Python Versions -Python 3.6 and 3.7, and 3.8 are fully supported and tested. This library may work on later versions of 3, but we do not currently run tests against those versions +Python 3.6 and 3.7, 3.8, and 3.9 are fully supported and tested. This library may work on later versions of 3, but we do not currently run tests against those versions ## Unsupported Python Versions From 3db6f10fb2af1b6b5660f362b83df5e5a7adebc4 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Wed, 9 Dec 2020 11:37:34 -0700 Subject: [PATCH 8/8] Update README.md Co-authored-by: Anthonios Partheniou --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07e64d24e5f..ff244866dd2 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ virtualenv ## Supported Python Versions -Python 3.6 and 3.7, 3.8, and 3.9 are fully supported and tested. This library may work on later versions of 3, but we do not currently run tests against those versions +Python 3.6, 3.7, 3.8, and 3.9 are fully supported and tested. This library may work on later versions of 3, but we do not currently run tests against those versions. ## Unsupported Python Versions