From cc13e09ad61ed9eb6b395f336266c033d1a5cede Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Tue, 13 Dec 2022 16:38:08 -0600 Subject: [PATCH 1/3] deps: remove upper bound on packaging dependency Towards #1435 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9e1bfbbce..d107f74d3 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ # https://github.com/googleapis/google-cloud-python/issues/10566 "google-cloud-core >= 1.4.1, <3.0.0dev", "google-resumable-media >= 0.6.0, < 3.0dev", - "packaging >= 14.3, <22.0.0dev", + "packaging >= 14.3", "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", # For the legacy proto-based types. "python-dateutil >= 2.7.2, <3.0dev", "requests >= 2.21.0, < 3.0.0dev", From 11474fe8b331c2fe98cb990623feb74092c83f91 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Tue, 13 Dec 2022 16:41:54 -0600 Subject: [PATCH 2/3] install prerelease version of packaging --- noxfile.py | 5 +++++ testing/constraints-3.7.txt | 1 + 2 files changed, 6 insertions(+) diff --git a/noxfile.py b/noxfile.py index a91e60a5f..6404d10df 100644 --- a/noxfile.py +++ b/noxfile.py @@ -290,6 +290,11 @@ def prerelease_deps(session): "--upgrade", "pandas", ) + session.install( + "--pre", + "--upgrade", + "git+https://github.com/pypa/packaging.git", + ) session.install( "--pre", diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index 149d6c496..4a5244fd6 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -17,6 +17,7 @@ ipython==7.0.1 opentelemetry-api==1.1.0 opentelemetry-instrumentation==0.20b0 opentelemetry-sdk==1.1.0 +packaging==14.3 pandas==1.1.0 proto-plus==1.22.0 protobuf==3.19.5 From 3ac82139e99dfa7c269112fd9af7d4cb401d918f Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Fri, 13 Jan 2023 11:13:48 -0600 Subject: [PATCH 3/3] bump minimum packaging version --- setup.py | 2 +- testing/constraints-3.7.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b583cfad4..d5e480427 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ # https://github.com/googleapis/google-cloud-python/issues/10566 "google-cloud-core >= 1.4.1, <3.0.0dev", "google-resumable-media >= 0.6.0, < 3.0dev", - "packaging >= 14.3", + "packaging >= 20.0.0", "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", # For the legacy proto-based types. "python-dateutil >= 2.7.2, <3.0dev", "requests >= 2.21.0, < 3.0.0dev", diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index 4a5244fd6..3701c7343 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -17,7 +17,7 @@ ipython==7.0.1 opentelemetry-api==1.1.0 opentelemetry-instrumentation==0.20b0 opentelemetry-sdk==1.1.0 -packaging==14.3 +packaging==20.0.0 pandas==1.1.0 proto-plus==1.22.0 protobuf==3.19.5