Skip to content

Commit 8437490

Browse files
authoredMay 25, 2023
feat: remove python 2.7 from setup.py and nox tests (#1301)
* feat: remove python 2.7 from setup.py and nox tests. Originally done in #892
1 parent 75878c8 commit 8437490

File tree

2 files changed

+3
-27
lines changed

2 files changed

+3
-27
lines changed
 

‎noxfile.py

-19
Original file line numberDiff line numberDiff line change
@@ -104,25 +104,6 @@ def unit(session):
104104
)
105105

106106

107-
@nox.session(python=["2.7"])
108-
def unit_prev_versions(session):
109-
constraints_path = str(
110-
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
111-
)
112-
session.install("-r", "testing/requirements.txt", "-c", constraints_path)
113-
session.install("-e", ".", "-c", constraints_path)
114-
session.run(
115-
"pytest",
116-
f"--junitxml=unit_{session.python}_sponge_log.xml",
117-
"--cov=google.auth",
118-
"--cov=google.oauth2",
119-
"--cov=tests",
120-
"--ignore=tests/test_pluggable.py", # Pluggable auth only support 3.6+ for now.
121-
"tests",
122-
"--ignore=tests/transport/test__custom_tls_signer.py", # enterprise cert is for python 3.6+
123-
)
124-
125-
126107
@nox.session(python="3.8")
127108
def cover(session):
128109
session.install("-r", "testing/requirements.txt")

‎setup.py

+3-8
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,14 @@
2424
"pyasn1-modules>=0.2.1",
2525
# rsa==4.5 is the last version to support 2.7
2626
# https://github.com/sybrenstuvel/python-rsa/issues/152#issuecomment-643470233
27-
'rsa<4.6; python_version < "3.6"',
28-
'rsa>=3.1.4,<5; python_version >= "3.6"',
27+
"rsa>=3.1.4,<5",
2928
# install enum34 to support 2.7. enum34 only works up to python version 3.3.
30-
'enum34>=1.1.10; python_version < "3.4"',
3129
"six>=1.9.0",
3230
"urllib3<2.0",
3331
)
3432

3533
extras = {
36-
"aiohttp": [
37-
"aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'",
38-
"requests >= 2.20.0, < 3.0.0dev",
39-
],
34+
"aiohttp": ["aiohttp >= 3.6.2, < 4.0.0dev", "requests >= 2.20.0, < 3.0.0dev"],
4035
"pyopenssl": ["pyopenssl>=20.0.0", "cryptography>=38.0.3"],
4136
"requests": "requests >= 2.20.0, < 3.0.0dev",
4237
"reauth": "pyu2f>=0.1.5",
@@ -67,7 +62,7 @@
6762
namespace_packages=("google",),
6863
install_requires=DEPENDENCIES,
6964
extras_require=extras,
70-
python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*",
65+
python_requires=">=3.6",
7166
license="Apache 2.0",
7267
keywords="google auth oauth client",
7368
classifiers=[

0 commit comments

Comments
 (0)
Please sign in to comment.