Skip to content

Commit cfd4688

Browse files
micafermicafer
authored
Merge branch 'trunk' into test_py312
2 parents 317ca3a + 283ee00 commit cfd4688

8 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
language: [ 'python' ]
3131

3232
steps:
33-
- uses: actions/checkout@v6
33+
- uses: actions/checkout@v7
3434
- name: Initialize CodeQL
3535
uses: github/codeql-action/init@v4
3636
with:

‎.github/workflows/depsreview.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
timeout-minutes: 15
1919

2020
steps:
21-
- uses: actions/checkout@v6
21+
- uses: actions/checkout@v7
2222
- name: Dependency Review
2323
uses: actions/dependency-review-action@v5
2424
# TODO: We really want one check for direct prod dependencies where we

‎.github/workflows/install-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- "pypy-3.10"
3030

3131
steps:
32-
- uses: actions/checkout@v6
32+
- uses: actions/checkout@v7
3333
- name: Use Python ${{ matrix.python_version }}
3434
uses: actions/setup-python@v6
3535
with:
@@ -50,7 +50,7 @@ jobs:
5050
timeout-minutes: 5
5151

5252
steps:
53-
- uses: actions/checkout@v6
53+
- uses: actions/checkout@v7
5454
- name: Verify Checksums
5555
run: |
5656
LAST_STABLE_VERSION=$(curl -s --fail https://pypi.org/pypi/apache-libcloud/json | jq ".releases | to_entries | last | .key" -r)

‎.github/workflows/integration-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ jobs:
3333
python_version: [ "3.12" ]
3434

3535
steps:
36-
- uses: actions/checkout@v6
36+
- uses: actions/checkout@v7
3737
- name: Use Python ${{ matrix.python_version }}
3838
uses: actions/setup-python@v6
3939
with:
4040
python-version: ${{ matrix.python_version }}
4141
- name: Install uv
42-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
42+
uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3
4343

4444
- name: Install OS / deb dependencies
4545
run: |

‎.github/workflows/main.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ jobs:
4343
- ubuntu-latest
4444

4545
steps:
46-
- uses: actions/checkout@v6
46+
- uses: actions/checkout@v7
4747
- name: Use Python ${{ matrix.python_version }}
4848
uses: actions/setup-python@v6
4949
with:
5050
python-version: ${{ matrix.python_version }}
5151
- name: Install uv
52-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
52+
uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3
5353

5454
- name: Install OS / deb dependencies
5555
run: |
@@ -86,13 +86,13 @@ jobs:
8686
python_version: [ "3.12" ]
8787

8888
steps:
89-
- uses: actions/checkout@v6
89+
- uses: actions/checkout@v7
9090
- name: Use Python ${{ matrix.python_version }}
9191
uses: actions/setup-python@v6
9292
with:
9393
python-version: ${{ matrix.python_version }}
9494
- name: Install uv
95-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
95+
uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3
9696

9797
- name: Install OS / deb dependencies
9898
run: |
@@ -134,13 +134,13 @@ jobs:
134134
python_version: [ "3.12" ]
135135

136136
steps:
137-
- uses: actions/checkout@v6
137+
- uses: actions/checkout@v7
138138
- name: Use Python ${{ matrix.python_version }}
139139
uses: actions/setup-python@v6
140140
with:
141141
python-version: ${{ matrix.python_version }}
142142
- name: Install uv
143-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
143+
uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3
144144

145145
- name: Install OS / deb dependencies
146146
run: |
@@ -176,7 +176,7 @@ jobs:
176176
python_version: [ "3.12" ]
177177

178178
steps:
179-
- uses: actions/checkout@v6
179+
- uses: actions/checkout@v7
180180

181181
- name: Install system dependencies
182182
run: |
@@ -188,7 +188,7 @@ jobs:
188188
with:
189189
python-version: ${{ matrix.python_version }}
190190
- name: Install uv
191-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
191+
uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3
192192
- name: Install OS / deb dependencies
193193
run: |
194194
sudo DEBIAN_FRONTEND=noninteractive apt-get update
@@ -262,7 +262,7 @@ jobs:
262262
python_version: [ "3.12" ]
263263

264264
steps:
265-
- uses: actions/checkout@v6
265+
- uses: actions/checkout@v7
266266
- name: Build Testing Docker Image
267267
run: docker build -f contrib/Dockerfile -t libcloud_runtest_img .
268268
- name: Verify Image Works
@@ -281,13 +281,13 @@ jobs:
281281
python_version: [ "3.12" ]
282282

283283
steps:
284-
- uses: actions/checkout@v6
284+
- uses: actions/checkout@v7
285285
- name: Use Python ${{ matrix.python_version }}
286286
uses: actions/setup-python@v6
287287
with:
288288
python-version: ${{ matrix.python_version }}
289289
- name: Install uv
290-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
290+
uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3
291291

292292
- name: Install OS / deb dependencies
293293
run: |
@@ -354,13 +354,13 @@ jobs:
354354
python_version: [ "3.12" ]
355355

356356
steps:
357-
- uses: actions/checkout@v6
357+
- uses: actions/checkout@v7
358358
- name: Use Python ${{ matrix.python_version }}
359359
uses: actions/setup-python@v6
360360
with:
361361
python-version: ${{ matrix.python_version }}
362362
- name: Install uv
363-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
363+
uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3
364364

365365
- name: Install OS / deb dependencies
366366
run: |
@@ -393,13 +393,13 @@ jobs:
393393
python_version: [ "3.12" ]
394394

395395
steps:
396-
- uses: actions/checkout@v6
396+
- uses: actions/checkout@v7
397397
- name: Use Python ${{ matrix.python_version }}
398398
uses: actions/setup-python@v6
399399
with:
400400
python-version: ${{ matrix.python_version }}
401401
- name: Install uv
402-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
402+
uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3
403403

404404
- name: Print Environment Info
405405
run: printenv | sort

‎.github/workflows/publish_dev_artifact.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
timeout-minutes: 5
2424

2525
steps:
26-
- uses: actions/checkout@v6
26+
- uses: actions/checkout@v7
2727
- name: Use Python ${{ matrix.python_version }}
2828
uses: actions/setup-python@v6
2929
with:
3030
python-version: "3.12"
3131
- name: Install uv
32-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
32+
uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3
3333

3434
- name: Print Environment Info
3535
run: printenv | sort

‎.github/workflows/publish_pricing_to_s3.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
python_version: [ "3.12" ]
2121

2222
steps:
23-
- uses: actions/checkout@v6
23+
- uses: actions/checkout@v7
2424
- name: Use Python ${{ matrix.python_version }}
2525
uses: actions/setup-python@v6
2626
with:
2727
python-version: ${{ matrix.python_version }}
2828
- name: Install uv
29-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
29+
uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3
3030

3131
- name: Print Environment Info
3232
run: printenv | sort

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ test = [
8484
"requests_mock==1.12.1",
8585
"pytest==9.0.3",
8686
"pytest-xdist==3.6.1",
87-
"pytest-timeout==2.3.1",
87+
"pytest-timeout==2.4.0",
8888
"pytest-benchmark[histogram]==5.1.0; python_version >= '3.10'",
8989
"cryptography==49.0.0; python_version >= '3.11'",
9090
"pyopenssl==26.3.0; python_version >= '3.11'",

0 commit comments

Comments
 (0)