aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorohmayr <omairnaveed@ymail.com>2024-03-27 15:07:06 -0400
committerGitHub <noreply@github.com>2024-03-27 12:07:06 -0700
commit727c073bb89c6b3c40c6bb7498ee46fc5ffaac8a (patch)
tree9b9de559fcd25dedb2fb036ff1e4f8c4b5b5184b
parent4766fbd932a302d20c3345ea036d9933f37c181d (diff)
downloadgoogle-api-python-client-727c073bb89c6b3c40c6bb7498ee46fc5ffaac8a.tar.gz
fix(deps): require httplib2>=0.19.0 (#2371)
* chore: apply constraints for testing dependency versions * update setup.py * fix the version number * nit: remove unnecessary comments * add upper bound to google-auth-httplib2
-rw-r--r--noxfile.py4
-rw-r--r--setup.py6
-rw-r--r--testing/constraints-3.10.txt6
-rw-r--r--testing/constraints-3.7.txt7
-rw-r--r--testing/constraints-3.8.txt6
-rw-r--r--testing/constraints-3.9.txt7
6 files changed, 29 insertions, 7 deletions
diff --git a/noxfile.py b/noxfile.py
index 89c6668ba..767def379 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -104,9 +104,11 @@ def unit(session, oauth2client):
session.install("setuptools", "wheel")
session.run("python3", "setup.py", "bdist_wheel")
session.install(os.path.join("dist", os.listdir("dist").pop()))
+ root_dir = os.path.dirname(os.path.realpath(__file__))
+ constraints_path = str(f"{root_dir}/testing/constraints-{session.python}.txt")
+ session.install("-r", constraints_path)
# Run tests from a different directory to test the package artifacts
- root_dir = os.path.dirname(os.path.realpath(__file__))
temp_dir = session.create_tmp()
session.chdir(temp_dir)
shutil.copytree(os.path.join(root_dir, "tests"), "tests")
diff --git a/setup.py b/setup.py
index 105cb1c4a..6f735a2fc 100644
--- a/setup.py
+++ b/setup.py
@@ -33,12 +33,12 @@ from setuptools import setup
packages = ["apiclient", "googleapiclient", "googleapiclient/discovery_cache"]
install_requires = [
- "httplib2>=0.15.0,<1.dev0",
+ "httplib2>=0.19.0,<1.dev0",
# NOTE: Maintainers, please do not require google-auth>=2.x.x
# Until this issue is closed
# https://github.com/googleapis/google-cloud-python/issues/10566
- "google-auth>=1.19.0,<3.0.0.dev0",
- "google-auth-httplib2>=0.1.0",
+ "google-auth>=1.32.0,<3.0.0.dev0,!=2.24.0,!=2.25.0",
+ "google-auth-httplib2>=0.2.0, <1.0.0",
# NOTE: Maintainers, please do not require google-api-core>=2.x.x
# Until this issue is closed
# https://github.com/googleapis/google-cloud-python/issues/10566
diff --git a/testing/constraints-3.10.txt b/testing/constraints-3.10.txt
index e69de29bb..e474f9c69 100644
--- a/testing/constraints-3.10.txt
+++ b/testing/constraints-3.10.txt
@@ -0,0 +1,6 @@
+# Test an old version of google-auth against the latest version of api-core.
+httplib2==0.19.0
+google-auth==1.32.0
+google-auth-httplib2==0.2.0
+google-api-core
+uritemplate==3.0.1 \ No newline at end of file
diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt
index 55f99b726..63319d20e 100644
--- a/testing/constraints-3.7.txt
+++ b/testing/constraints-3.7.txt
@@ -5,8 +5,9 @@
#
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
# Then this file should have foo==1.14.0
-httplib2==0.15.0
-google-auth==1.19.0
-google-auth-httplib2==0.0.3
+# Test minimum requirements.
+httplib2==0.19.0
+google-auth==1.32.0
+google-auth-httplib2==0.2.0
google-api-core==1.31.5
uritemplate==3.0.1 \ No newline at end of file
diff --git a/testing/constraints-3.8.txt b/testing/constraints-3.8.txt
index e69de29bb..72dd399a2 100644
--- a/testing/constraints-3.8.txt
+++ b/testing/constraints-3.8.txt
@@ -0,0 +1,6 @@
+# Test a new version of google-auth against the minimum supported version of api-core.
+httplib2==0.19.0
+google-auth
+google-auth-httplib2==0.2.0
+google-api-core==1.31.5
+uritemplate==3.0.1 \ No newline at end of file
diff --git a/testing/constraints-3.9.txt b/testing/constraints-3.9.txt
index e69de29bb..f12503bc1 100644
--- a/testing/constraints-3.9.txt
+++ b/testing/constraints-3.9.txt
@@ -0,0 +1,7 @@
+# Test the latest version of google-auth against the version of
+# api-core with ClientOptions.universe_domain.
+httplib2==0.19.0
+google-auth
+google-auth-httplib2==0.2.0
+google-api-core==2.15.0
+uritemplate==3.0.1 \ No newline at end of file