Skip to content

Commit 0cd1a78

Browse files
kgala2kgala2
committed
Merge branch 'main' into integrate-psc-tests
2 parents a836016 + 29f8da1 commit 0cd1a78

20 files changed

+90
-88
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,20 @@ jobs:
4242

4343
steps:
4444
- name: Checkout repository
45-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
45+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
49+
uses: github/codeql-action/init@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
5050
with:
5151
languages: ${{ matrix.language }}
5252

5353
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
5454
# If this step fails, then you should remove it and run the build manually
5555
- name: Autobuild
56-
uses: github/codeql-action/autobuild@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
56+
uses: github/codeql-action/autobuild@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
5757

5858
- name: Perform CodeQL Analysis
59-
uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
59+
uses: github/codeql-action/analyze@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
6060
with:
6161
category: "/language:${{matrix.language}}"

‎.github/workflows/coverage.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,34 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Setup Python
27-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
27+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
2828
with:
29-
python-version: "3.10"
29+
python-version: "3.13"
3030

3131
- run: pip install nox coverage
3232

3333
- name: Checkout base branch
34-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3535
with:
3636
ref: ${{ github.base_ref }}
3737

3838
- name: Calculate base code coverage
3939
run: |
40-
nox --sessions unit-3.10
40+
nox --sessions unit-3.13
4141
coverage report --show-missing
4242
export CUR_COVER=$(coverage report | awk '$1 == "TOTAL" {print $NF+0}')
4343
echo "CUR_COVER=$CUR_COVER" >> $GITHUB_ENV
4444
coverage erase
4545
4646
- name: Checkout PR branch
47-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
47+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4848
with:
4949
ref: ${{ github.event.pull_request.head.sha }}
5050
repository: ${{ github.event.pull_request.head.repo.full_name }}
5151

5252
- name: Calculate PR code coverage
5353
run: |
54-
nox --sessions unit-3.10
54+
nox --sessions unit-3.13
5555
coverage report --show-missing
5656
export PR_COVER=$(coverage report | awk '$1 == "TOTAL" {print $NF+0}')
5757
echo "PR_COVER=$PR_COVER" >> $GITHUB_ENV

‎.github/workflows/labels.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
issues: write
2929
pull-requests: write
3030
steps:
31-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
31+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3232
- uses: micnncim/action-label-syncer@3abd5ab72fda571e69fffd97bd4e0033dd5f495c # v1.3.0
3333
env:
3434
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/lint.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Setup Python
28-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
28+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
2929
with:
30-
python-version: "3.12"
30+
python-version: "3.13"
3131

3232
- name: Install nox
3333
run: pip install nox
3434

3535
- name: Checkout code
36-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
36+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3737

3838
- name: Run nox lint session
3939
run: nox --sessions lint

‎.github/workflows/scorecard.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535

3636
steps:
3737
- name: "Checkout code"
38-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
38+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3939
with:
4040
persist-credentials: false
4141

4242
- name: "Run analysis"
43-
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
43+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
4444
with:
4545
results_file: results.sarif
4646
results_format: sarif
@@ -57,14 +57,14 @@ jobs:
5757
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5858
# format to the repository Actions tab.
5959
- name: "Upload artifact"
60-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
60+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
6161
with:
6262
name: SARIF file
6363
path: results.sarif
6464
retention-days: 5
6565

6666
# Upload the results to GitHub's code scanning dashboard.
6767
- name: "Upload to code-scanning"
68-
uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
68+
uses: github/codeql-action/upload-sarif@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
6969
with:
7070
sarif_file: resultsFiltered.sarif

‎.github/workflows/tests.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ jobs:
4444
pull-requests: write
4545
steps:
4646
- name: Checkout code
47-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
47+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4848

4949
- name: Setup Python ${{ matrix.python-version }}
50-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
50+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
5151
with:
5252
python-version: ${{ matrix.python-version }}
5353

@@ -56,15 +56,15 @@ jobs:
5656

5757
- id: auth
5858
name: Authenticate to Google Cloud
59-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
59+
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
6060
with:
6161
workload_identity_provider: ${{ vars.PROVIDER_NAME }}
6262
service_account: ${{ vars.SERVICE_ACCOUNT }}
6363
access_token_lifetime: 600s
6464

6565
- id: secrets
6666
name: Get secrets
67-
uses: google-github-actions/get-secretmanager-secrets@a8440875e1c2892062aef9061228d4f1af8f919b # v2.2.3
67+
uses: google-github-actions/get-secretmanager-secrets@50ec04d56ddf2740b0bde82926cc742f90e06d2b # v2.2.4
6868
with:
6969
secrets: |-
7070
MYSQL_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_CONNECTION_NAME
@@ -153,10 +153,10 @@ jobs:
153153
pull-requests: write
154154
steps:
155155
- name: Checkout code
156-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
156+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
157157

158158
- name: Setup Python ${{ matrix.python-version }}
159-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
159+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
160160
with:
161161
python-version: ${{ matrix.python-version }}
162162

@@ -167,7 +167,7 @@ jobs:
167167
name: Authenticate to Google Cloud
168168
# only needed for Flakybot on periodic (schedule) and continuous (push) events
169169
if: ${{ github.event_name == 'schedule' || github.event_name == 'push' }}
170-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
170+
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
171171
with:
172172
workload_identity_provider: ${{ vars.PROVIDER_NAME }}
173173
service_account: ${{ vars.SERVICE_ACCOUNT }}

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# Changelog
22

3+
## [1.18.4](https://github.com/GoogleCloudPlatform/cloud-sql-python-connector/compare/v1.18.3...v1.18.4) (2025-08-12)
4+
5+
6+
### Bug Fixes
7+
8+
* bump dependencies to latest ([#1317](https://github.com/GoogleCloudPlatform/cloud-sql-python-connector/issues/1317)) ([6ebfac6](https://github.com/GoogleCloudPlatform/cloud-sql-python-connector/commit/6ebfac67199b44ab517af7ab57027c64c784f1a1))
9+
10+
## [1.18.3](https://github.com/GoogleCloudPlatform/cloud-sql-python-connector/compare/v1.18.2...v1.18.3) (2025-07-11)
11+
12+
13+
### Bug Fixes
14+
15+
* suppress lint check for _scopes property ([#1308](https://github.com/GoogleCloudPlatform/cloud-sql-python-connector/issues/1308)) ([821245c](https://github.com/GoogleCloudPlatform/cloud-sql-python-connector/commit/821245c1911fb970e3409b3e249698937a8b7867))
16+
17+
## [1.18.2](https://github.com/GoogleCloudPlatform/cloud-sql-python-connector/compare/v1.18.1...v1.18.2) (2025-05-20)
18+
19+
20+
### Bug Fixes
21+
22+
* bump dependencies to latest ([#1295](https://github.com/GoogleCloudPlatform/cloud-sql-python-connector/issues/1295)) ([dc907ef](https://github.com/GoogleCloudPlatform/cloud-sql-python-connector/commit/dc907ef18905959b5116032f66fff78b9cddc13d))
23+
324
## [1.18.1](https://github.com/GoogleCloudPlatform/cloud-sql-python-connector/compare/v1.18.0...v1.18.1) (2025-04-16)
425

526

‎google/cloud/sql/connector/client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import aiohttp
2323
from cryptography.hazmat.backends import default_backend
2424
from cryptography.x509 import load_pem_x509_certificate
25+
2526
from google.auth.credentials import TokenState
2627
from google.auth.transport import requests
27-
2828
from google.cloud.sql.connector.connection_info import ConnectionInfo
2929
from google.cloud.sql.connector.connection_name import ConnectionName
3030
from google.cloud.sql.connector.exceptions import AutoIAMAuthNotSupported

‎google/cloud/sql/connector/connector.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import google.auth
2929
from google.auth.credentials import Credentials
3030
from google.auth.credentials import with_scopes_if_required
31-
3231
import google.cloud.sql.connector.asyncpg as asyncpg
3332
from google.cloud.sql.connector.client import CloudSQLClient
3433
from google.cloud.sql.connector.enums import DriverMapping

‎google/cloud/sql/connector/refresh_utils.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from typing import Any, Callable
2525

2626
import aiohttp
27+
2728
from google.auth.credentials import Credentials
2829
from google.auth.credentials import Scoped
2930
import google.auth.transport.requests
@@ -103,7 +104,7 @@ def _downscope_credentials(
103104
scoped_creds = copy.copy(credentials)
104105
# overwrite '_scopes' to down-scope user credentials
105106
# Cloud SDK reference: https://github.com/google-cloud-sdk-unofficial/google-cloud-sdk/blob/93920ccb6d2cce0fe6d1ce841e9e33410551d66b/lib/googlecloudsdk/command_lib/sql/generate_login_token_util.py#L116
106-
scoped_creds._scopes = scopes
107+
scoped_creds._scopes = scopes # type: ignore[attr-defined]
107108
# down-scoped credentials require refresh, are invalid after being re-scoped
108109
request = google.auth.transport.requests.Request()
109110
scoped_creds.refresh(request)

0 commit comments

Comments
 (0)