-
Notifications
You must be signed in to change notification settings - Fork 1.7k
ci(google-auth): separate core vs extras lower-bound constraints #17593
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.
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
Changes from 3 commits
d7fef3f
55c9b18
a77a995
b910d0f
87181fc
f83bb4a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -170,16 +170,28 @@ def unit(session, install_deprecated_extras): | |
| f"Extended tests only run on boundary Python versions ({min_py}, {max_py}) to reduce CI load." | ||
| ) | ||
|
|
||
| constraints_path = str( | ||
| constraints_path = ( | ||
| CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt" | ||
| ) | ||
| extras_str = "testing" | ||
| extras_constraints_path = ( | ||
| CURRENT_DIRECTORY / "testing" / f"constraints-extras-{session.python}.txt" | ||
| ) | ||
|
|
||
| if install_deprecated_extras: | ||
| # rsa and oauth2client were both archived and support dropped, | ||
| # but we still test old code paths | ||
| session.install("oauth2client") | ||
|
ohmayr marked this conversation as resolved.
|
||
| extras_str += ",rsa" | ||
| session.install("-e", f".[{extras_str}]", "-c", constraints_path) | ||
| extra_str = ".[testing,enterprise_cert,rsa]" | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Isn't adding these extras (and oauthlib above) redundant, since the constraints-extas.txt file also contains them? Is there a benefit to installing them this way too? If so, should we be doing this for all extras?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A -c constraints.txt file only constrains package versions for packages that pip is already installing; it does not trigger installation of any package by itself. |
||
| else: | ||
| extra_str = ".[testing]" | ||
|
|
||
| install_args = ["-e", extra_str] | ||
| if constraints_path.exists(): | ||
| install_args.extend(["-c", str(constraints_path)]) | ||
| if install_deprecated_extras and extras_constraints_path.exists(): | ||
| install_args.extend(["-c", str(extras_constraints_path)]) | ||
|
ohmayr marked this conversation as resolved.
Outdated
|
||
|
|
||
| session.install(*install_args) | ||
| session.run( | ||
| "pytest", | ||
| f"--junitxml=unit_{session.python}_sponge_log.xml", | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,9 @@ | ||
| urllib3>2.0.0 | ||
| # This constraints file is used to check that lower bounds | ||
| # are correct in setup.py | ||
| # List *all* library dependencies and extras in this file. | ||
| # Pin the version to the lower bound. | ||
| # | ||
| # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", | ||
| # Then this file should have foo==1.14.0 | ||
| pyasn1-modules==0.2.1 | ||
| cryptography==38.0.3 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,9 @@ | ||
| urllib3>2.0.0 | ||
| # This constraints file is used to check that lower bounds | ||
| # are correct in setup.py | ||
| # List *all* library dependencies and extras in this file. | ||
| # Pin the version to the lower bound. | ||
| # | ||
| # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", | ||
| # Then this file should have foo==1.14.0 | ||
| pyasn1-modules==0.2.1 | ||
| cryptography==38.0.3 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| # This constraints file is used to check that lower bounds | ||
| # are correct in setup.py | ||
| # List *all* library dependencies and extras in this file. | ||
| # Pin the version to the lower bound. | ||
| # | ||
| # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", | ||
| # Then this file should have foo==1.14.0 | ||
| pyasn1-modules==0.2.1 | ||
| cryptography==38.0.3 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,4 +7,3 @@ | |
| # Then this file should have foo==1.14.0 | ||
| pyasn1-modules==0.2.1 | ||
| cryptography==41.0.5 | ||
| aiohttp==3.9.0 | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # This constraints file is used to check that lower bounds | ||
| # are correct in setup.py | ||
| # List *all* library dependencies and extras in this file. | ||
| # Pin the version to the lower bound. | ||
| # | ||
| # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", | ||
| # Then this file should have foo==1.14.0 | ||
| aiohttp==3.8.0 # aiohttp extra | ||
| requests==2.30.0 # requests extra | ||
| pyjwt==2.0 # pyjwt extra | ||
| grpcio==1.59.0 # grpc extra | ||
| urllib3==1.26.15 # urllib3 extra | ||
| packaging==20.0 # urllib3 extra | ||
| pyu2f==0.1.5 # reauth extra | ||
| rsa==4.0.0 # rsa extra | ||
| oauth2client==4.1.3 # deprecated test dependency |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # This constraints file is used to check that lower bounds | ||
| # are correct in setup.py | ||
| # List *all* library dependencies and extras in this file. | ||
| # Pin the version to the lower bound. | ||
| # | ||
| # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", | ||
| # Then this file should have foo==1.14.0 | ||
| aiohttp==3.9.0 # aiohttp extra | ||
| requests==2.30.0 # requests extra | ||
| pyjwt==2.0 # pyjwt extra | ||
| grpcio==1.75.1 # grpc extra | ||
| urllib3==1.26.15 # urllib3 extra | ||
| packaging==20.0 # urllib3 extra | ||
| pyu2f==0.1.5 # reauth extra | ||
| rsa==4.0.0 # rsa extra | ||
| oauth2client==4.1.3 # deprecated test dependency |
Uh oh!
There was an error while loading. Please reload this page.