Skip to content

feat: remove python 2.7 from setup.py and nox tests #1301

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
clundin25 merged 4 commits into from
May 25, 2023
Merged

feat: remove python 2.7 from setup.py and nox tests #1301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdde6bb
feat: remove python 2.7 from setup.py and nox tests. Originally done …
clundin25 May 22, 2023
e347d70
Run linter.
clundin25 May 22, 2023
5ab7c8b
Merge branch 'main' into remove-py
clundin25 May 24, 2023
e00ae53
Merge branch 'main' into remove-py
clundin25 May 25, 2023
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
19 changes: 0 additions & 19 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,25 +104,6 @@ def unit(session):
)


@nox.session(python=["2.7"])
def unit_prev_versions(session):
constraints_path = str(
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
)
session.install("-r", "testing/requirements.txt", "-c", constraints_path)
session.install("-e", ".", "-c", constraints_path)
session.run(
"pytest",
f"--junitxml=unit_{session.python}_sponge_log.xml",
"--cov=google.auth",
"--cov=google.oauth2",
"--cov=tests",
"--ignore=tests/test_pluggable.py", # Pluggable auth only support 3.6+ for now.
"tests",
"--ignore=tests/transport/test__custom_tls_signer.py", # enterprise cert is for python 3.6+
)


@nox.session(python="3.8")
def cover(session):
session.install("-r", "testing/requirements.txt")
Expand Down
11 changes: 3 additions & 8 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,14 @@
"pyasn1-modules>=0.2.1",
# rsa==4.5 is the last version to support 2.7
# https://github.com/sybrenstuvel/python-rsa/issues/152#issuecomment-643470233
'rsa<4.6; python_version < "3.6"',
'rsa>=3.1.4,<5; python_version >= "3.6"',
"rsa>=3.1.4,<5",
# install enum34 to support 2.7. enum34 only works up to python version 3.3.
'enum34>=1.1.10; python_version < "3.4"',
"six>=1.9.0",
"urllib3<2.0",
)

extras = {
"aiohttp": [
"aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'",
"requests >= 2.20.0, < 3.0.0dev",
],
"aiohttp": ["aiohttp >= 3.6.2, < 4.0.0dev", "requests >= 2.20.0, < 3.0.0dev"],
"pyopenssl": ["pyopenssl>=20.0.0", "cryptography>=38.0.3"],
"requests": "requests >= 2.20.0, < 3.0.0dev",
"reauth": "pyu2f>=0.1.5",
Expand Down Expand Up @@ -67,7 +62,7 @@
namespace_packages=("google",),
install_requires=DEPENDENCIES,
extras_require=extras,
python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*",
python_requires=">=3.6",
license="Apache 2.0",
keywords="google auth oauth client",
classifiers=[
Expand Down