diff --git a/noxfile.py b/noxfile.py index 236b59c4b..94661df31 100644 --- a/noxfile.py +++ b/noxfile.py @@ -12,10 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -import shutil import os +import pathlib +import shutil + import nox +CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() + TEST_DEPENDENCIES = [ "flask", "freezegun", @@ -84,15 +88,20 @@ def blacken(session): @nox.session(python=["3.6", "3.7", "3.8", "3.9"]) def unit(session): - session.install(*TEST_DEPENDENCIES) - session.install(*(ASYNC_DEPENDENCIES)) - session.install(".") + constraints_path = str( + CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt" + ) + add_constraints = ["-c", constraints_path] + session.install(*(TEST_DEPENDENCIES + add_constraints)) + session.install(*(ASYNC_DEPENDENCIES + add_constraints)) + session.install(".", *add_constraints) session.run( "pytest", f"--junitxml=unit_{session.python}_sponge_log.xml", "--cov=google.auth", "--cov=google.oauth2", "--cov=tests", + "--cov-report=term-missing", "tests", "tests_async", ) @@ -123,7 +132,7 @@ def cover(session): "--cov=google.oauth2", "--cov=tests", "--cov=tests_async", - "--cov-report=", + "--cov-report=term-missing", "tests", "tests_async", ) diff --git a/setup.py b/setup.py index f2fd4e539..a9bfc9738 100644 --- a/setup.py +++ b/setup.py @@ -33,8 +33,7 @@ extras = { "aiohttp": [ "aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'", - "requests >= 2.18.0, < 3.0.0dev", - "urllib3 >= 1.0.0, <2.0.0dev", + "requests >= 2.20.0, < 3.0.0dev", ], "pyopenssl": "pyopenssl>=20.0.0", "reauth": "pyu2f>=0.1.5", diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 7cb802a8b..ad6f59846 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -9,8 +9,6 @@ cachetools==2.0.0 pyasn1-modules==0.2.1 setuptools==40.3.0 six==1.9.0 -rsa==4.6 rsa==3.1.4 aiohttp==3.6.2 -requests==2.18.0 -urllib3==1.0.0 +requests==2.20.0