From 26ac4e2faf7c7b78ef50858f8b8df881d502cd16 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Wed, 11 Mar 2026 19:33:27 +0000 Subject: [PATCH 1/2] tests: remove tests for 3.7/3.8 --- .github/workflows/unittest.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index d783dca883ff..7b1809e1c5f0 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -14,13 +14,10 @@ permissions: jobs: unit: - # TODO(https://github.com/googleapis/gapic-generator-python/issues/2303): use `ubuntu-latest` once this bug is fixed. - # Use ubuntu-22.04 until Python 3.7 is removed from the test matrix - # https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories runs-on: ubuntu-22.04 strategy: matrix: - python: ['3.7', '3.8', '3.9', '3.10', "3.11", "3.12", "3.13", "3.14"] + python: ['3.9', '3.10', "3.11", "3.12", "3.13", "3.14"] steps: - name: Checkout uses: actions/checkout@v4 From 64f99fcb6744cb4f06b40b76c6416256a1c27813 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Wed, 11 Mar 2026 20:43:07 +0000 Subject: [PATCH 2/2] chore: update post processing files --- .../add-dependency-google-cloud-common.yaml | 14 ++-- ...-dependencies-to-setup-py-constraints.yaml | 76 +++++++++---------- .../bigquery-storage-integration.yaml | 10 +-- ...containeranalysis-grafeas-integration.yaml | 14 ++-- .../firestore-integration.yaml | 6 +- .../integrate-isolated-handwritten-code.yaml | 40 +++++----- .../logging-integration.yaml | 11 ++- ...y-error-with-org-policy-as-dependency.yaml | 14 ++-- .../pubsub-integration.yaml | 64 ---------------- .../unique-grafeas-client.yaml | 2 +- 10 files changed, 95 insertions(+), 156 deletions(-) diff --git a/.librarian/generator-input/client-post-processing/add-dependency-google-cloud-common.yaml b/.librarian/generator-input/client-post-processing/add-dependency-google-cloud-common.yaml index c6992913b73f..2471e680d80b 100644 --- a/.librarian/generator-input/client-post-processing/add-dependency-google-cloud-common.yaml +++ b/.librarian/generator-input/client-post-processing/add-dependency-google-cloud-common.yaml @@ -19,14 +19,14 @@ replacements: ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core\[grpc\] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core[grpc] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -34,13 +34,13 @@ replacements: "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ - packages/google-cloud-filestore/testing/constraints-3.7.txt + packages/google-cloud-filestore/testing/constraints-3.9.txt ] before: | - google-api-core==1.34.1 - google-auth==2.14.1 + google-api-core==2.21.0 + google-auth==2.35.0 after: | - google-api-core==1.34.1 + google-api-core==2.21.0 google-cloud-common==1.0.0 - google-auth==2.14.1 + google-auth==2.35.0 count: 1 diff --git a/.librarian/generator-input/client-post-processing/add-missing-dependencies-to-setup-py-constraints.yaml b/.librarian/generator-input/client-post-processing/add-missing-dependencies-to-setup-py-constraints.yaml index f3262d7936c2..3b72a834394c 100644 --- a/.librarian/generator-input/client-post-processing/add-missing-dependencies-to-setup-py-constraints.yaml +++ b/.librarian/generator-input/client-post-processing/add-missing-dependencies-to-setup-py-constraints.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -description: setup.py and testing/constraints-3.7.txt are missing necessary dependencies +description: setup.py and testing/constraints-3.9.txt are missing necessary dependencies url: https://github.com/googleapis/gapic-generator-python/issues/1831 replacements: - paths: [ @@ -19,14 +19,14 @@ replacements: ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core\[grpc\] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core[grpc] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -34,29 +34,29 @@ replacements: "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ - packages/google-cloud-gke-hub/testing/constraints-3.7.txt + packages/google-cloud-gke-hub/testing/constraints-3.9.txt ] before: | - google-api-core==1.34.1 - google-auth==2.14.1 + google-api-core==2.21.0 + google-auth==2.35.0 after: | - google-api-core==1.34.1 + google-api-core==2.21.0 grpc-google-iam-v1==0.12.4 - google-auth==2.14.1 + google-auth==2.35.0 count: 1 - paths: [ packages/google-cloud-build/setup.py ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core\[grpc\] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core[grpc] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -64,29 +64,29 @@ replacements: "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ - packages/google-cloud-build/testing/constraints-3.7.txt + packages/google-cloud-build/testing/constraints-3.9.txt ] before: | - google-api-core==1.34.1 - google-auth==2.14.1 + google-api-core==2.21.0 + google-auth==2.35.0 after: | - google-api-core==1.34.1 + google-api-core==2.21.0 grpc-google-iam-v1==0.12.4 - google-auth==2.14.1 + google-auth==2.35.0 count: 1 - paths: [ packages/google-cloud-binary-authorization/setup.py ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core\[grpc\] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core[grpc] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -94,40 +94,40 @@ replacements: "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ - packages/google-cloud-binary-authorization/testing/constraints-3.7.txt + packages/google-cloud-binary-authorization/testing/constraints-3.9.txt ] before: | - google-api-core==1.34.1 - google-auth==2.14.1 + google-api-core==2.21.0 + google-auth==2.35.0 after: | - google-api-core==1.34.1 + google-api-core==2.21.0 grafeas==1.1.2 - google-auth==2.14.1 + google-auth==2.35.0 count: 1 - paths: [ - packages/google-cloud-iam/testing/constraints-3.7.txt + packages/google-cloud-iam/testing/constraints-3.9.txt ] before: | - google-api-core==1.34.1 - google-auth==2.14.1 + google-api-core==2.21.0 + google-auth==2.35.0 after: | - google-api-core==1.34.1 + google-api-core==2.21.0 grpc-google-iam-v1==0.12.4 - google-auth==2.14.1 + google-auth==2.35.0 count: 1 - paths: [ packages/google-cloud-iam/setup.py ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core\[grpc\] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core[grpc] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -139,14 +139,14 @@ replacements: ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core\[grpc\] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core[grpc] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -158,14 +158,14 @@ replacements: ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core\[grpc\] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core[grpc] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -173,13 +173,13 @@ replacements: "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ - packages/google-shopping-merchant-notifications/testing/constraints-3.7.txt + packages/google-shopping-merchant-notifications/testing/constraints-3.9.txt ] before: | - google-api-core==1.34.1 - google-auth==2.14.1 + google-api-core==2.21.0 + google-auth==2.35.0 after: | - google-api-core==1.34.1 + google-api-core==2.21.0 google-shopping-type==1.0.0 - google-auth==2.14.1 + google-auth==2.35.0 count: 1 diff --git a/.librarian/generator-input/client-post-processing/bigquery-storage-integration.yaml b/.librarian/generator-input/client-post-processing/bigquery-storage-integration.yaml index 00b9e1682ab9..4df0546cdf87 100644 --- a/.librarian/generator-input/client-post-processing/bigquery-storage-integration.yaml +++ b/.librarian/generator-input/client-post-processing/bigquery-storage-integration.yaml @@ -452,20 +452,20 @@ replacements: ) count: 1 - paths: [ - packages/google-cloud-bigquery-storage/testing/constraints-3.7.txt, + packages/google-cloud-bigquery-storage/testing/constraints-3.9.txt, ] before: | - google-api-core==1.34.1 - google-auth==2.14.1 + google-api-core==2.21.0 + google-auth==2.35.0 after: | - google-api-core==1.34.1 + google-api-core==2.21.0 libcst==0.2.5 fastavro==0.21.2 # pytz is required by pandas pytz pandas==1.0.5 pyarrow==0.15.0 - google-auth==2.14.1 + google-auth==2.35.0 count: 1 # Given that this file is mostly handwritten, we could omit the file during code generation # This will require a change to gapic-generator-python to provide the ability to omit files diff --git a/.librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml b/.librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml index 8b88081a2f26..8593192c3591 100644 --- a/.librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml +++ b/.librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml @@ -19,14 +19,14 @@ replacements: ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core\[grpc\] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core[grpc] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -34,15 +34,15 @@ replacements: "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ - packages/google-cloud-containeranalysis/testing/constraints-3.7.txt + packages/google-cloud-containeranalysis/testing/constraints-3.9.txt ] before: | - google-api-core==1.34.1 - google-auth==2.14.1 + google-api-core==2.21.0 + google-auth==2.35.0 after: | - google-api-core==1.34.1 + google-api-core==2.21.0 grafeas==1.4.1 - google-auth==2.14.1 + google-auth==2.35.0 count: 1 - paths: [ packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/client.py, diff --git a/.librarian/generator-input/client-post-processing/firestore-integration.yaml b/.librarian/generator-input/client-post-processing/firestore-integration.yaml index 766a560ee5f0..17334149cc41 100644 --- a/.librarian/generator-input/client-post-processing/firestore-integration.yaml +++ b/.librarian/generator-input/client-post-processing/firestore-integration.yaml @@ -16,15 +16,15 @@ description: Integrate Google Cloud Firestore Handwritten code url: https://github.com/googleapis/gapic-generator-python/issues/123 replacements: - paths: [ - "packages/google-cloud-firestore/testing/constraints-3.7.txt", + "packages/google-cloud-firestore/testing/constraints-3.9.txt", ] before: | proto-plus==1.22.3 - protobuf==3.20.2 + protobuf==4.25.8 after: | proto-plus==1.22.3 google-cloud-core==1.4.1 - protobuf==3.20.2 + protobuf==4.25.8 count: 1 - paths: [ "packages/google-cloud-firestore/google/cloud/firestore_bundle/types/bundle.py", diff --git a/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml index 986ed5853c3a..6bacbaa9a8f0 100644 --- a/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml +++ b/.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml @@ -60,14 +60,14 @@ replacements: ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core\[grpc\] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core[grpc] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -75,15 +75,15 @@ replacements: "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ - "packages/google-cloud-translate/testing/constraints-3.7.txt" + "packages/google-cloud-translate/testing/constraints-3.9.txt" ] before: | proto-plus==1.22.3 - protobuf==3.20.2 + protobuf==4.25.8 after: | proto-plus==1.22.3 google-cloud-core==1.4.4 - protobuf==3.20.2 + protobuf==4.25.8 count: 1 - paths: [ "packages/google-cloud-translate/docs/index.rst", @@ -167,15 +167,15 @@ replacements: extras = {"pandas": "pandas >= 0.23.2"} count: 1 - paths: [ - packages/google-cloud-monitoring/testing/constraints-3.7.txt, + packages/google-cloud-monitoring/testing/constraints-3.9.txt, ] before: | - google-api-core==1.34.1 - google-auth==2.14.1 + google-api-core==2.21.0 + google-auth==2.35.0 after: | - google-api-core==1.34.1 + google-api-core==2.21.0 pandas==0.23.2 - google-auth==2.14.1 + google-auth==2.35.0 count: 1 - paths: [ packages/google-cloud-monitoring/noxfile.py, @@ -218,17 +218,17 @@ replacements: } count: 1 - paths: [ - packages/google-cloud-automl/testing/constraints-3.7.txt, + packages/google-cloud-automl/testing/constraints-3.9.txt, ] before: | - google-api-core==1.34.1 - google-auth==2.14.1 + google-api-core==2.21.0 + google-auth==2.35.0 after: | - google-api-core==1.34.1 + google-api-core==2.21.0 google-cloud-storage==1.18.0 libcst==0.2.5 pandas==1.0.5 - google-auth==2.14.1 + google-auth==2.35.0 count: 1 - paths: [ packages/google-cloud-automl/docs/automl_v1beta1/services_.rst, @@ -344,15 +344,15 @@ replacements: "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ - packages/google-cloud-error-reporting/testing/constraints-3.7.txt, + packages/google-cloud-error-reporting/testing/constraints-3.9.txt, ] before: | - google-api-core==1.34.1 - google-auth==2.14.1 + google-api-core==2.21.0 + google-auth==2.35.0 after: | - google-api-core==1.34.1 + google-api-core==2.21.0 google-cloud-logging==1.14.0 - google-auth==2.14.1 + google-auth==2.35.0 count: 1 - paths: [ "packages/google-cloud-error-reporting/docs/index.rst", diff --git a/.librarian/generator-input/client-post-processing/logging-integration.yaml b/.librarian/generator-input/client-post-processing/logging-integration.yaml index 885f18afc00e..dc7955067b7e 100644 --- a/.librarian/generator-input/client-post-processing/logging-integration.yaml +++ b/.librarian/generator-input/client-post-processing/logging-integration.yaml @@ -286,11 +286,11 @@ replacements: after: 'logging_v2.types.Tail' count: 2 - paths: [ - "packages/google-cloud-logging/testing/constraints-3.7.txt", + "packages/google-cloud-logging/testing/constraints-3.9.txt", ] before: | proto-plus==1.22.3 - protobuf==3.20.2 + protobuf==4.25.8 after: | proto-plus==1.22.3 google-cloud-core==2.0.0 @@ -306,7 +306,7 @@ replacements: markupsafe==2.0.1 itsdangerous==2.0.1 werkzeug==1.0.1 - protobuf==3.20.2 + protobuf==4.25.8 count: 1 - paths: [ "packages/google-cloud-logging/docs/conf.py", @@ -476,7 +476,10 @@ replacements: ] before: | """Run the type checker.""" - [\s\S]*?"google",\n \) + [\s\S]*?"google", + \ "--check-untyped-defs", + \ \*session.posargs, + \ \) after: | """Run the type checker.""" diff --git a/.librarian/generator-input/client-post-processing/mypy-error-with-org-policy-as-dependency.yaml b/.librarian/generator-input/client-post-processing/mypy-error-with-org-policy-as-dependency.yaml index 2c244b441296..76c32ad18dce 100644 --- a/.librarian/generator-input/client-post-processing/mypy-error-with-org-policy-as-dependency.yaml +++ b/.librarian/generator-input/client-post-processing/mypy-error-with-org-policy-as-dependency.yaml @@ -19,14 +19,14 @@ replacements: ] before: | dependencies = \[ - "google-api-core\[grpc\] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core\[grpc\] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", "grpcio >= 1.33.2, < 2.0.0", after: | dependencies = [ - "google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", + "google-api-core[grpc] >= 2.11.0, <3.0.0", # Exclude incompatible versions of `google-auth` # See https://github.com/googleapis/google-cloud-python/issues/12364 "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0", @@ -34,13 +34,13 @@ replacements: "grpcio >= 1.33.2, < 2.0.0", count: 1 - paths: [ - packages/google-cloud-asset/testing/constraints-3.7.txt + packages/google-cloud-asset/testing/constraints-3.9.txt ] before: | - google-api-core==1.34.1 - google-auth==2.14.1 + google-api-core==2.21.0 + google-auth==2.35.0 after: | - google-api-core==1.34.1 + google-api-core==2.21.0 google-cloud-org-policy==0.1.2 - google-auth==2.14.1 + google-auth==2.35.0 count: 1 diff --git a/.librarian/generator-input/client-post-processing/pubsub-integration.yaml b/.librarian/generator-input/client-post-processing/pubsub-integration.yaml index 8e2c953576b1..90cada35fa62 100644 --- a/.librarian/generator-input/client-post-processing/pubsub-integration.yaml +++ b/.librarian/generator-input/client-post-processing/pubsub-integration.yaml @@ -387,28 +387,6 @@ replacements: after: 'description = "Google Cloud Pub/Sub API client library"' count: 1 - # --- FIX: Drop Py 3.7/3.8 classifiers in setup.py --- - - paths: - - "packages/google-cloud-pubsub/setup.py" - before: '([ \t]+"Programming Language :: Python :: 3",\n)[ \t]+"Programming Language :: Python :: 3\.7",\n[ \t]+"Programming Language :: Python :: 3\.8",\n' - after: '\g<1>' - count: 1 - - # --- FIX: Restore setup.py python_requires to >=3.9 --- - - paths: - - "packages/google-cloud-pubsub/setup.py" - before: 'python_requires=">=3\.7",' - after: 'python_requires=">=3.9",' - count: 1 - - # --- FIX: Restore comment and allow google-api-core >= 1.34.0 --- - - paths: - - "packages/google-cloud-pubsub/setup.py" - before: '([ \t]+)"google-api-core\[grpc\] >= 1\.34\.1,([^"]+)",' - after: |- - \g<1># google-api-core >= 1.34.0 is allowed in order to support google-api-core 1.x - \g<1>"google-api-core[grpc] >= 1.34.0,\g<2>", - count: 1 # --- FIX: Restore pubsub-specific grpcio bound --- - paths: @@ -429,23 +407,6 @@ replacements: ] extras = {"libcst": "libcst >= 0.3.10"} count: 1 -# --- FIX: Blend README Python versions --- - - paths: - - "packages/google-cloud-pubsub/README.rst" - before: 'Supported Python Versions\n\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^\^[\s\S]+?\.\. _end-of-life: https://devguide\.python\.org/devcycle/#end-of-life-branches' - after: |- - Supported Python Versions - ^^^^^^^^^^^^^^^^^^^^^^^^^ - Python >= 3.9 - - Deprecated Python Versions - ^^^^^^^^^^^^^^^^^^^^^^^^^^ - Python < 3.9 - - The last version of this library compatible with Python 3.7 and 3.8 is google-cloud-pubsub==2.34.0. - - The last version of this library compatible with Python 2.7 is google-cloud-pubsub==1.7.0. - count: 1 - paths: - "packages/google-cloud-pubsub/noxfile.py" before: 'UNIT_TEST_DEPENDENCIES: List\[str\] = \[\]' @@ -548,17 +509,6 @@ replacements: \g<1> count: 1 - - paths: - - "packages/google-cloud-pubsub/noxfile.py" - before: '# Install all test dependencies, then install this package in-place\.\n\n([ \t]+)# TODO\(https://github\.com/googleapis/gapic-generator-python/issues/2388\):' - after: |- - # Install all test dependencies, then install this package in-place. - - \g<1>if session.python in ["3.7", "3.8"]: - \g<1> session.skip(f"Python {session.python} is no longer supported.") - - \g<1># TODO(https://github.com/googleapis/gapic-generator-python/issues/2388): - count: 1 - paths: - "packages/google-cloud-pubsub/noxfile.py" before: 'def core_deps_from_source\(session, protobuf_implementation\):[\s\S]+?PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,\n[ \t]+},\n[ \t]+\)' @@ -567,25 +517,11 @@ replacements: """Skipping until Pub/Sub migration is complete.""" session.skip("Skipping core_deps_from_source for google-cloud-pubsub.") count: 1 - - paths: - - "packages/google-cloud-pubsub/noxfile.py" - before: 'SYSTEM_TEST_PYTHON_VERSIONS: List\[str\] = ALL_PYTHON' - after: 'SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.12"]' - count: 1 - paths: - "packages/google-cloud-pubsub/noxfile.py" before: '"--cov=google",' after: '"--cov=google/cloud",' count: 1 - - paths: - - "packages/google-cloud-pubsub/noxfile.py" - before: '([ \t]+)session\.install\("--pre", "grpcio"\)' - after: |- - \g<1># Use pre-release gRPC for system tests. - \g<1># Exclude version 1.52.0rc1 which has a known issue. - \g<1># See https://github.com/grpc/grpc/issues/32163 - \g<1>session.install("--pre", "grpcio!=1.52.0rc1") - count: 1 - paths: - "packages/google-cloud-pubsub/docs/conf.py" before: 'exclude_patterns = \[\n([ \t]+)"_build",' diff --git a/.librarian/generator-input/client-post-processing/unique-grafeas-client.yaml b/.librarian/generator-input/client-post-processing/unique-grafeas-client.yaml index 2be1435ed04f..2721437f2b51 100644 --- a/.librarian/generator-input/client-post-processing/unique-grafeas-client.yaml +++ b/.librarian/generator-input/client-post-processing/unique-grafeas-client.yaml @@ -236,7 +236,7 @@ replacements: # Use backslashes to preserve leading spaces before: | \ @property - \ def api_endpoint\(self\): + \ def api_endpoint\(self\) -> str: [\s\S]*?return self\._client\._universe_domain\n after: "" count: 1