Skip to content

Commit 50cc992

Browse files
committed
style(google-auth): restore original header in constraints files
1 parent ab4f176 commit 50cc992

9 files changed

Lines changed: 46 additions & 29 deletions

packages/google-auth/noxfile.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,12 @@ def mypy(session):
159159

160160

161161
@nox.session(python=ALL_PYTHON)
162-
@nox.parametrize(["install_extras"], (True, False))
163-
def unit(session, install_extras):
162+
@nox.parametrize(["install_deprecated_extras"], (True, False))
163+
def unit(session, install_deprecated_extras):
164164
# Install all test dependencies, then install this package in-place.
165165

166166
min_py, max_py = UNIT_TEST_PYTHON_VERSIONS[0], UNIT_TEST_PYTHON_VERSIONS[-1]
167-
if not install_extras and session.python not in (min_py, max_py):
167+
if not install_deprecated_extras and session.python not in (min_py, max_py):
168168
# only run double tests on first and last supported versions
169169
session.skip(
170170
f"Extended tests only run on boundary Python versions ({min_py}, {max_py}) to reduce CI load."
@@ -178,15 +178,15 @@ def unit(session, install_extras):
178178
)
179179

180180
install_args = ["-e"]
181-
if install_extras:
181+
if install_deprecated_extras:
182182
session.install("oauth2client")
183183
install_args.append(".[testing,enterprise_cert,rsa]")
184184
else:
185185
install_args.append(".[testing]")
186186

187187
if core_constraints.exists():
188188
install_args.extend(["-c", str(core_constraints)])
189-
if install_extras and extras_constraints.exists():
189+
if install_deprecated_extras and extras_constraints.exists():
190190
install_args.extend(["-c", str(extras_constraints)])
191191

192192
session.install(*install_args)

packages/google-auth/setup.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,18 @@
5656

5757
# Unit test requirements.
5858
testing_extra_require = [
59-
# gRPC extra
6059
*grpc_extra_require,
61-
# PyJWT extra
62-
*pyjwt_extra_require,
63-
# Reauth extra
64-
*reauth_extra_require,
65-
# urllib3 extra
66-
*urllib3_extra_require,
67-
# aiohttp extra
68-
*aiohttp_extra_require,
69-
# Test runners & mocks
7060
"flask",
7161
"freezegun",
62+
*pyjwt_extra_require,
7263
"pytest",
7364
"pytest-cov",
7465
"pytest-localserver",
66+
*reauth_extra_require,
7567
"responses",
68+
*urllib3_extra_require,
69+
# Async Dependencies
70+
*aiohttp_extra_require,
7671
"aioresponses",
7772
"pytest-asyncio",
7873
]

packages/google-auth/testing/constraints-3.10.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,3 @@
88
pyasn1-modules==0.2.1
99
setuptools==40.3.0
1010
cryptography==38.0.3
11-
aiohttp==3.8.0
12-
requests==2.30.0
13-
pyjwt==2.0
14-
grpcio==1.59.0
15-
urllib3==1.26.15
16-
packaging==20.0
17-
rsa==4.0.0
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
# Lower-bound constraints for Python 3.11 core dependencies.
1+
# This constraints file is used to check that lower bounds
2+
# are correct in setup.py
3+
# List *all* library dependencies and extras in this file.
4+
# Pin the version to the lower bound.
5+
#
6+
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
7+
# Then this file should have foo==1.14.0
28
pyasn1-modules==0.2.1
39
cryptography==38.0.3
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
# Lower-bound constraints for Python 3.12 core dependencies.
1+
# This constraints file is used to check that lower bounds
2+
# are correct in setup.py
3+
# List *all* library dependencies and extras in this file.
4+
# Pin the version to the lower bound.
5+
#
6+
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
7+
# Then this file should have foo==1.14.0
28
pyasn1-modules==0.2.1
39
cryptography==38.0.3
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
# Lower-bound constraints for Python 3.13 core dependencies.
1+
# This constraints file is used to check that lower bounds
2+
# are correct in setup.py
3+
# List *all* library dependencies and extras in this file.
4+
# Pin the version to the lower bound.
5+
#
6+
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
7+
# Then this file should have foo==1.14.0
28
pyasn1-modules==0.2.1
39
cryptography==38.0.3

packages/google-auth/testing/constraints-3.14.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@
77
# Then this file should have foo==1.14.0
88
pyasn1-modules==0.2.1
99
cryptography==41.0.5
10-
aiohttp==3.9.0

packages/google-auth/testing/constraints-extras-3.10.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
# Lower-bound constraints for Python 3.10 optional extras & test dependencies.
1+
# This constraints file is used to check that lower bounds
2+
# are correct in setup.py
3+
# List *all* library dependencies and extras in this file.
4+
# Pin the version to the lower bound.
5+
#
6+
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
7+
# Then this file should have foo==1.14.0
28
aiohttp==3.8.0
39
requests==2.30.0
410
pyjwt==2.0

packages/google-auth/testing/constraints-extras-3.14.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
# Lower-bound constraints for Python 3.14 optional extras & test dependencies.
1+
# This constraints file is used to check that lower bounds
2+
# are correct in setup.py
3+
# List *all* library dependencies and extras in this file.
4+
# Pin the version to the lower bound.
5+
#
6+
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
7+
# Then this file should have foo==1.14.0
28
aiohttp==3.9.0
39
requests==2.30.0
410
pyjwt==2.0
511
grpcio==1.75.1
6-
urllib3==2.0.0
12+
urllib3==1.26.15
713
packaging==20.0
814
pyu2f==0.1.5
915
rsa==4.0.0

0 commit comments

Comments
 (0)