From 8325d24acaa2b2077acaaea26ea5fafb6dd856c5 Mon Sep 17 00:00:00 2001
From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com>
Date: Wed, 9 Dec 2020 12:04:05 -0700
Subject: [PATCH] chore(deps)!: require 3.6+ (#961)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removes 2.7 and 3.5 from the test suite and explicitly requires >= 3.6. Also adds tests for 3.9

Fixes #704 🦕
---
 README.md  |  6 +++---
 noxfile.py |  8 ++------
 setup.py   | 14 +++++---------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 0fae27dad95..ff244866dd2 100644
--- a/README.md
+++ b/README.md
@@ -48,11 +48,11 @@ virtualenv <your-env>
 
 ## 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, 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.
 
-## Deprecated Python Versions
+## Unsupported Python Versions
 
-Python == 2.7
+Python < 3.6
 
 ## Third Party Libraries and Dependencies
 
diff --git a/noxfile.py b/noxfile.py
index 9f448fb1811..71467382eff 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -18,6 +18,7 @@
 import nox
 
 test_dependencies = [
+    "django>=2.0.0",
     "google-auth",
     "google-auth-httplib2",
     "mox",
@@ -46,7 +47,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",
     [
@@ -59,11 +60,6 @@ def lint(session):
 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('.')
 
     # Run py.test against the unit tests.
diff --git a/setup.py b/setup.py
index bf0a8f42131..189f5fd42f5 100644
--- a/setup.py
+++ b/setup.py
@@ -21,11 +21,8 @@
 
 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)
+if sys.version_info < (3, 6):
+    print("google-api-python-client requires python3 version >= 3.6.", file=sys.stderr)
     sys.exit(1)
 
 import io
@@ -61,18 +58,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.6",
     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",
+        "Programming Language :: Python :: 3.9",
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",