Skip to content

Commit cec2b31

Browse files
Pierre-SassoulasPierre-Sassoulas
committed
Merge branch 'main' into invalid-name-type-annotation
2 parents 692895e + 537e9da commit cec2b31

File tree

136 files changed

+1111
-454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+1111
-454
lines changed

‎.github/workflows/changelog.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
env:
99
CACHE_VERSION: 1
1010
KEY_PREFIX: base-venv
11-
DEFAULT_PYTHON: "3.12"
11+
DEFAULT_PYTHON: "3.13"
1212

1313
permissions:
1414
contents: read
@@ -21,7 +21,7 @@ jobs:
2121
timeout-minutes: 10
2222
steps:
2323
- name: Check out code from GitHub
24-
uses: actions/checkout@v4.1.7
24+
uses: actions/checkout@v4.2.1
2525
with:
2626
# `towncrier check` runs `git diff --name-only origin/main...`, which
2727
# needs a non-shallow clone.
@@ -41,7 +41,7 @@ jobs:
4141
$GITHUB_OUTPUT
4242
- name: Restore Python virtual environment
4343
id: cache-venv
44-
uses: actions/cache@v4.0.2
44+
uses: actions/cache@v4.1.1
4545
with:
4646
path: venv
4747
key: >-

‎.github/workflows/checks.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
env:
1414
CACHE_VERSION: 2
1515
KEY_PREFIX: base-venv
16-
DEFAULT_PYTHON: "3.12"
16+
DEFAULT_PYTHON: "3.13"
1717
PRE_COMMIT_CACHE: ~/.cache/pre-commit
1818

1919
concurrency:
@@ -33,7 +33,7 @@ jobs:
3333
pre-commit-key: ${{ steps.generate-pre-commit-key.outputs.key }}
3434
steps:
3535
- name: Check out code from GitHub
36-
uses: actions/checkout@v4.1.7
36+
uses: actions/checkout@v4.2.1
3737
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
3838
id: python
3939
uses: actions/[email protected]
@@ -49,7 +49,7 @@ jobs:
4949
$GITHUB_OUTPUT
5050
- name: Restore Python virtual environment
5151
id: cache-venv
52-
uses: actions/cache@v4.0.2
52+
uses: actions/cache@v4.1.1
5353
with:
5454
path: venv
5555
key: >-
@@ -71,7 +71,7 @@ jobs:
7171
hashFiles('.pre-commit-config.yaml') }}" >> $GITHUB_OUTPUT
7272
- name: Restore pre-commit environment
7373
id: cache-precommit
74-
uses: actions/cache@v4.0.2
74+
uses: actions/cache@v4.1.1
7575
with:
7676
path: ${{ env.PRE_COMMIT_CACHE }}
7777
key: >-
@@ -89,7 +89,7 @@ jobs:
8989
needs: prepare-base
9090
steps:
9191
- name: Check out code from GitHub
92-
uses: actions/checkout@v4.1.7
92+
uses: actions/checkout@v4.2.1
9393
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
9494
id: python
9595
uses: actions/[email protected]
@@ -98,7 +98,7 @@ jobs:
9898
check-latest: true
9999
- name: Restore Python virtual environment
100100
id: cache-venv
101-
uses: actions/cache@v4.0.2
101+
uses: actions/cache@v4.1.1
102102
with:
103103
path: venv
104104
fail-on-cache-miss: true
@@ -107,7 +107,7 @@ jobs:
107107
needs.prepare-base.outputs.python-key }}
108108
- name: Restore pre-commit environment
109109
id: cache-precommit
110-
uses: actions/cache@v4.0.2
110+
uses: actions/cache@v4.1.1
111111
with:
112112
path: ${{ env.PRE_COMMIT_CACHE }}
113113
fail-on-cache-miss: true
@@ -130,7 +130,7 @@ jobs:
130130
needs: prepare-base
131131
steps:
132132
- name: Check out code from GitHub
133-
uses: actions/checkout@v4.1.7
133+
uses: actions/checkout@v4.2.1
134134
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
135135
id: python
136136
uses: actions/[email protected]
@@ -139,7 +139,7 @@ jobs:
139139
check-latest: true
140140
- name: Restore Python virtual environment
141141
id: cache-venv
142-
uses: actions/cache@v4.0.2
142+
uses: actions/cache@v4.1.1
143143
with:
144144
path: venv
145145
fail-on-cache-miss: true
@@ -158,7 +158,7 @@ jobs:
158158
needs: prepare-base
159159
steps:
160160
- name: Check out code from GitHub
161-
uses: actions/checkout@v4.1.7
161+
uses: actions/checkout@v4.2.1
162162
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
163163
id: python
164164
uses: actions/[email protected]
@@ -167,7 +167,7 @@ jobs:
167167
check-latest: true
168168
- name: Restore Python virtual environment
169169
id: cache-venv
170-
uses: actions/cache@v4.0.2
170+
uses: actions/cache@v4.1.1
171171
with:
172172
path: venv
173173
fail-on-cache-miss: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
steps:
5050
- name: Checkout repository
51-
uses: actions/checkout@v4.1.7
51+
uses: actions/checkout@v4.2.1
5252

5353
# Initializes the CodeQL tools for scanning.
5454
- name: Initialize CodeQL

‎.github/workflows/primer-test.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
timeout-minutes: 5
3131
strategy:
3232
matrix:
33-
python-version: [3.9, "3.10", "3.11", "3.12", "3.13-dev"]
33+
python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
3434
outputs:
3535
python-key: ${{ steps.generate-python-key.outputs.key }}
3636
steps:
3737
- name: Check out code from GitHub
38-
uses: actions/checkout@v4.1.7
38+
uses: actions/checkout@v4.2.1
3939
- name: Set up Python ${{ matrix.python-version }}
4040
id: python
4141
uses: actions/[email protected]
@@ -51,7 +51,7 @@ jobs:
5151
$GITHUB_OUTPUT
5252
- name: Restore Python virtual environment
5353
id: cache-venv
54-
uses: actions/cache@v4.0.2
54+
uses: actions/cache@v4.1.1
5555
with:
5656
path: venv
5757
key: >-
@@ -72,10 +72,10 @@ jobs:
7272
needs: prepare-tests-linux
7373
strategy:
7474
matrix:
75-
python-version: [3.9, "3.10", "3.11", "3.12", "3.13-dev"]
75+
python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
7676
steps:
7777
- name: Check out code from GitHub
78-
uses: actions/checkout@v4.1.7
78+
uses: actions/checkout@v4.2.1
7979
- name: Set up Python ${{ matrix.python-version }}
8080
id: python
8181
uses: actions/[email protected]
@@ -84,7 +84,7 @@ jobs:
8484
check-latest: true
8585
- name: Restore Python virtual environment
8686
id: cache-venv
87-
uses: actions/cache@v4.0.2
87+
uses: actions/cache@v4.1.1
8888
with:
8989
path: venv
9090
fail-on-cache-miss: true

‎.github/workflows/primer_comment.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
# This needs to be the SAME as in the Main and PR job
1717
CACHE_VERSION: 4
1818
KEY_PREFIX: venv-primer
19-
DEFAULT_PYTHON: "3.12"
19+
DEFAULT_PYTHON: "3.13"
2020

2121
permissions:
2222
contents: read
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Check out code from GitHub
33-
uses: actions/checkout@v4.1.7
33+
uses: actions/checkout@v4.2.1
3434
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
3535
id: python
3636
uses: actions/[email protected]
@@ -41,7 +41,7 @@ jobs:
4141
# Restore cached Python environment
4242
- name: Restore Python virtual environment
4343
id: cache-venv
44-
uses: actions/cache@v4.0.2
44+
uses: actions/cache@v4.1.1
4545
with:
4646
path: venv
4747
key:

‎.github/workflows/primer_run_main.yaml‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929
timeout-minutes: 45
3030
strategy:
3131
matrix:
32-
python-version: ["3.9", "3.12"]
32+
python-version: ["3.9", "3.13"]
3333
batches: [4]
3434
batchIdx: [0, 1, 2, 3]
3535
steps:
3636
- name: Check out code from GitHub
37-
uses: actions/checkout@v4.1.7
37+
uses: actions/checkout@v4.2.1
3838
- name: Set up Python ${{ matrix.python-version }}
3939
id: python
4040
uses: actions/[email protected]
@@ -43,9 +43,9 @@ jobs:
4343
check-latest: true
4444

4545
# Create a re-usable virtual environment
46-
- name: Create Python virtual environment cache
46+
- name: Restore Python virtual environment cache
4747
id: cache-venv
48-
uses: actions/cache@v4.0.2
48+
uses: actions/cache/restore@v4.1.1
4949
with:
5050
path: venv
5151
key:
@@ -60,6 +60,17 @@ jobs:
6060
. venv/bin/activate
6161
python -m pip install -U pip setuptools wheel
6262
pip install -U -r requirements_test.txt
63+
# Save cached Python environment (explicit because cancel-in-progress: true)
64+
- name: Save Python virtual environment to cache
65+
if: steps.cache-venv.outputs.cache-hit != 'true'
66+
uses: actions/cache/[email protected]
67+
with:
68+
path: venv
69+
key:
70+
${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
71+
env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{ hashFiles('pyproject.toml',
72+
'requirements_test.txt', 'requirements_test_min.txt',
73+
'requirements_test_pre_commit.txt') }}
6374

6475
# Cache primer packages
6576
- name: Get commit string
@@ -71,7 +82,7 @@ jobs:
7182
echo "commitstring=$output" >> $GITHUB_OUTPUT
7283
- name: Restore projects cache
7384
id: cache-projects
74-
uses: actions/cache@v4.0.2
85+
uses: actions/cache/restore@v4.1.1
7586
with:
7687
path: tests/.pylint_primer_tests/
7788
key: >-
@@ -82,8 +93,16 @@ jobs:
8293
run: |
8394
. venv/bin/activate
8495
python tests/primer/__main__.py prepare --clone
96+
- name: Save projects cache
97+
if: steps.cache-projects.outputs.cache-hit != 'true'
98+
uses: actions/cache/[email protected]
99+
with:
100+
path: tests/.pylint_primer_tests/
101+
key: >-
102+
${{ runner.os }}-${{ matrix.python-version }}-${{
103+
steps.commitstring.outputs.commitstring }}-primer
85104
- name: Upload commit string
86-
uses: actions/[email protected].0
105+
uses: actions/[email protected].3
87106
if: matrix.batchIdx == 0
88107
with:
89108
name: primer_commitstring_${{ matrix.python-version }}
@@ -104,7 +123,7 @@ jobs:
104123
then echo "::warning ::$WARNINGS"
105124
fi
106125
- name: Upload output
107-
uses: actions/[email protected].0
126+
uses: actions/[email protected].3
108127
with:
109128
name:
110129
primer_output_main_${{ matrix.python-version }}_batch${{ matrix.batchIdx }}

‎.github/workflows/primer_run_pr.yaml‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ jobs:
3838
timeout-minutes: 45
3939
strategy:
4040
matrix:
41-
python-version: ["3.9", "3.12"]
41+
python-version: ["3.9", "3.13"]
4242
batches: [4]
4343
batchIdx: [0, 1, 2, 3]
4444
steps:
4545
- name: Check out code from GitHub
46-
uses: actions/checkout@v4.1.7
46+
uses: actions/checkout@v4.2.1
4747
with:
4848
fetch-depth: 0
4949
- name: Set up Python ${{ matrix.python-version }}
@@ -56,7 +56,7 @@ jobs:
5656
# Restore cached Python environment
5757
- name: Restore Python virtual environment
5858
id: cache-venv
59-
uses: actions/cache@v4.0.2
59+
uses: actions/cache/restore@v4.1.1
6060
with:
6161
path: venv
6262
key:
@@ -72,6 +72,17 @@ jobs:
7272
. venv/bin/activate
7373
python -m pip install -U pip setuptools wheel
7474
pip install -U -r requirements_test.txt
75+
# Save cached Python environment (explicit because cancel-in-progress: true)
76+
- name: Save Python virtual environment
77+
if: steps.cache-venv.outputs.cache-hit != 'true'
78+
uses: actions/cache/[email protected]
79+
with:
80+
path: venv
81+
key:
82+
${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
83+
env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{ hashFiles('pyproject.toml',
84+
'requirements_test.txt', 'requirements_test_min.txt',
85+
'requirements_test_pre_commit.txt') }}
7586

7687
# Cache primer packages
7788
- name: Download last 'main' run info
@@ -140,7 +151,7 @@ jobs:
140151
echo "commitstring=$output" >> $GITHUB_OUTPUT
141152
- name: Restore projects cache
142153
id: cache-projects
143-
uses: actions/cache@v4.0.2
154+
uses: actions/cache/restore@v4.1.1
144155
with:
145156
path: tests/.pylint_primer_tests/
146157
key: >-
@@ -151,6 +162,14 @@ jobs:
151162
run: |
152163
. venv/bin/activate
153164
python tests/primer/__main__.py prepare --clone
165+
- name: Save projects cache
166+
if: steps.cache-projects.outputs.cache-hit != 'true'
167+
uses: actions/cache/[email protected]
168+
with:
169+
path: tests/.pylint_primer_tests/
170+
key: >-
171+
${{ runner.os }}-${{ matrix.python-version }}-${{
172+
steps.commitstring.outputs.commitstring }}-primer
154173
- name: Check cache
155174
run: |
156175
. venv/bin/activate
@@ -178,15 +197,15 @@ jobs:
178197
then echo "::warning ::$WARNINGS"
179198
fi
180199
- name: Upload output of PR
181-
uses: actions/[email protected].0
200+
uses: actions/[email protected].3
182201
with:
183202
name:
184203
primer_output_pr_${{ matrix.python-version }}_batch${{ matrix.batchIdx }}
185204
path:
186205
tests/.pylint_primer_tests/output_${{ matrix.python-version }}_pr_batch${{
187206
matrix.batchIdx }}.txt
188207
- name: Upload output of 'main'
189-
uses: actions/[email protected].0
208+
uses: actions/[email protected].3
190209
with:
191210
name:
192211
primer_output_main_${{ matrix.python-version }}_batch${{ matrix.batchIdx }}
@@ -199,7 +218,7 @@ jobs:
199218
- name: Upload PR number
200219
if:
201220
startsWith(steps.python.outputs.python-version, '3.9') && matrix.batchIdx == 0
202-
uses: actions/[email protected].0
221+
uses: actions/[email protected].3
203222
with:
204223
name: pr_number
205224
path: pr_number.txt

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- published
77

88
env:
9-
DEFAULT_PYTHON: "3.12"
9+
DEFAULT_PYTHON: "3.13"
1010

1111
permissions:
1212
contents: read
@@ -20,7 +20,7 @@ jobs:
2020
url: https://pypi.org/project/pylint/
2121
steps:
2222
- name: Check out code from Github
23-
uses: actions/checkout@v4.1.7
23+
uses: actions/checkout@v4.2.1
2424
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
2525
id: python
2626
uses: actions/[email protected]

0 commit comments

Comments
 (0)