From 23a51cbf06f94dd390c072a9bb802db5980d93d1 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 25 Mar 2024 15:53:52 +0000 Subject: [PATCH 1/6] chore(deps): update all dependencies --- .github/workflows/unittest.yml | 4 ++-- .kokoro/docker/docs/requirements.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 2cfaada3..c9ff4af7 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -43,7 +43,7 @@ jobs: run: | nox -s unit${{ matrix.option }}-${{ matrix.python }} - name: Upload coverage results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: coverage-artifacts path: .coverage${{ matrix.option }}-${{ matrix.python }} @@ -65,7 +65,7 @@ jobs: python -m pip install --upgrade setuptools pip wheel python -m pip install coverage - name: Download coverage results - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: coverage-artifacts path: .coverage-results/ diff --git a/.kokoro/docker/docs/requirements.txt b/.kokoro/docker/docs/requirements.txt index 0e5d70f2..3707e103 100644 --- a/.kokoro/docker/docs/requirements.txt +++ b/.kokoro/docker/docs/requirements.txt @@ -16,9 +16,9 @@ distlib==0.3.8 \ --hash=sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784 \ --hash=sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64 # via virtualenv -filelock==3.13.1 \ - --hash=sha256:521f5f56c50f8426f5e03ad3b281b490a87ef15bc6c526f168290f0c7148d44e \ - --hash=sha256:57dbda9b35157b05fb3e58ee91448612eb674172fab98ee235ccb0b5bee19a1c +filelock==3.13.2 \ + --hash=sha256:9e2106260b5f65600a31bc503721e3db7e64598bb406ebc5921aeaafe441ba34 \ + --hash=sha256:e4c33bc026ace328551af557d4d34f59566c98acd4ed66c13b4335f114f04f7a # via virtualenv nox==2024.3.2 \ --hash=sha256:e53514173ac0b98dd47585096a55572fe504fecede58ced708979184d05440be \ From 8a913f879e0efb2551467dab17c0f1beb2746b8d Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 25 Mar 2024 15:55:45 +0000 Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .kokoro/docker/docs/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/docker/docs/requirements.txt b/.kokoro/docker/docs/requirements.txt index 3707e103..0e5d70f2 100644 --- a/.kokoro/docker/docs/requirements.txt +++ b/.kokoro/docker/docs/requirements.txt @@ -16,9 +16,9 @@ distlib==0.3.8 \ --hash=sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784 \ --hash=sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64 # via virtualenv -filelock==3.13.2 \ - --hash=sha256:9e2106260b5f65600a31bc503721e3db7e64598bb406ebc5921aeaafe441ba34 \ - --hash=sha256:e4c33bc026ace328551af557d4d34f59566c98acd4ed66c13b4335f114f04f7a +filelock==3.13.1 \ + --hash=sha256:521f5f56c50f8426f5e03ad3b281b490a87ef15bc6c526f168290f0c7148d44e \ + --hash=sha256:57dbda9b35157b05fb3e58ee91448612eb674172fab98ee235ccb0b5bee19a1c # via virtualenv nox==2024.3.2 \ --hash=sha256:e53514173ac0b98dd47585096a55572fe504fecede58ced708979184d05440be \ From 7f00004adef9f8997048013c88d0a0b3d70e85a4 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Sat, 27 Apr 2024 15:24:47 +0000 Subject: [PATCH 3/6] See https://github.com/googleapis/synthtool/pull/1910/files --- .github/workflows/unittest.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index c9ff4af7..58edaf60 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -45,7 +45,7 @@ jobs: - name: Upload coverage results uses: actions/upload-artifact@v4 with: - name: coverage-artifacts + name: coverage-artifact-${{ '{{' }} matrix.python {{ '}}' }} path: .coverage${{ matrix.option }}-${{ matrix.python }} report-coverage: @@ -67,9 +67,9 @@ jobs: - name: Download coverage results uses: actions/download-artifact@v4 with: - name: coverage-artifacts path: .coverage-results/ - name: Report coverage results run: | - coverage combine .coverage-results/.coverage* + find .coverage-results -type f -name '*.zip' -exec unzip {} \; + coverage combine .coverage-results/**/.coverage* coverage report --show-missing --fail-under=100 From 3b47b6bd7b16e6f5c01dba6e53e1f85b295064aa Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Sat, 27 Apr 2024 15:32:09 +0000 Subject: [PATCH 4/6] fix artifact name --- .github/workflows/unittest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 58edaf60..2118b02f 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -45,7 +45,7 @@ jobs: - name: Upload coverage results uses: actions/upload-artifact@v4 with: - name: coverage-artifact-${{ '{{' }} matrix.python {{ '}}' }} + name: coverage-artifact-${{ matrix.option }}-${{ matrix.python }} path: .coverage${{ matrix.option }}-${{ matrix.python }} report-coverage: From 44cec704be4e88fc89f3b85c0324dddae44d0733 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Sat, 27 Apr 2024 15:32:35 +0000 Subject: [PATCH 5/6] remove space --- .github/workflows/unittest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 2118b02f..a8eef614 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -45,7 +45,7 @@ jobs: - name: Upload coverage results uses: actions/upload-artifact@v4 with: - name: coverage-artifact-${{ matrix.option }}-${{ matrix.python }} + name: coverage-artifact-${{ matrix.option }}-${{ matrix.python }} path: .coverage${{ matrix.option }}-${{ matrix.python }} report-coverage: From 00a71b49ca58508dce107773b8e167e9d4bc8068 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Sat, 27 Apr 2024 15:34:49 +0000 Subject: [PATCH 6/6] See https://github.com/googleapis/python-api-core/issues/642 --- noxfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/noxfile.py b/noxfile.py index 2c7ec6c7..8fbcaec0 100644 --- a/noxfile.py +++ b/noxfile.py @@ -175,12 +175,12 @@ def pytype(session): def mypy(session): """Run type-checking.""" session.install(".[grpc]", "mypy") - # Exclude types-protobuf==4.24.0.20240106 - # See https://github.com/python/typeshed/issues/11254 session.install( "types-setuptools", "types-requests", - "types-protobuf!=4.24.0.20240106", + # TODO(https://github.com/googleapis/python-api-core/issues/642): + # Use the latest version of types-protobuf. + "types-protobuf<5", "types-mock", "types-dataclasses", )