Skip to content

Commit 849f68e

Browse files
Pierre-SassoulasPierre-Sassoulas
authored
Merge branch 'main' into same-name-stdlib
2 parents dae5921 + aa7916a commit 849f68e

File tree

127 files changed

+3552
-3111
lines changed

Some content is hidden

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

127 files changed

+3552
-3111
lines changed

‎.git-blame-ignore-revs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
add5f7b8eba427de9d39caae864bbc6dc37ef980

‎.github/workflows/backport.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ jobs:
2424
)
2525
)
2626
steps:
27-
- uses: tibdex/backport@2e217641d82d02ba0603f46b1aeedefb258890ac # v2.0.3
27+
- uses: tibdex/backport@9565281eda0731b1d20c4025c43339fb0a23812e # v2.0.4
2828
with:
2929
github_token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ci.yaml

+20-20
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
timeout-minutes: 20
2525
steps:
2626
- name: Check out code from GitHub
27-
uses: actions/checkout@v3.5.3
27+
uses: actions/checkout@v4.0.0
2828
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
2929
id: python
30-
uses: actions/setup-python@v4.6.1
30+
uses: actions/setup-python@v4.7.0
3131
with:
3232
python-version: ${{ env.DEFAULT_PYTHON }}
3333
check-latest: true
@@ -39,7 +39,7 @@ jobs:
3939
'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT
4040
- name: Restore Python virtual environment
4141
id: cache-venv
42-
uses: actions/[email protected].1
42+
uses: actions/[email protected].2
4343
with:
4444
path: venv
4545
key: >-
@@ -59,7 +59,7 @@ jobs:
5959
hashFiles('.pre-commit-config.yaml') }}" >> $GITHUB_OUTPUT
6060
- name: Restore pre-commit environment
6161
id: cache-precommit
62-
uses: actions/[email protected].1
62+
uses: actions/[email protected].2
6363
with:
6464
path: ${{ env.PRE_COMMIT_CACHE }}
6565
key: >-
@@ -81,15 +81,15 @@ jobs:
8181
strategy:
8282
fail-fast: false
8383
matrix:
84-
python-version: [3.8, 3.9, "3.10", "3.11"]
84+
python-version: [3.8, 3.9, "3.10", "3.11", "3.12-dev"]
8585
outputs:
8686
python-key: ${{ steps.generate-python-key.outputs.key }}
8787
steps:
8888
- name: Check out code from GitHub
89-
uses: actions/checkout@v3.5.3
89+
uses: actions/checkout@v4.0.0
9090
- name: Set up Python ${{ matrix.python-version }}
9191
id: python
92-
uses: actions/setup-python@v4.6.1
92+
uses: actions/setup-python@v4.7.0
9393
with:
9494
python-version: ${{ matrix.python-version }}
9595
check-latest: true
@@ -106,7 +106,7 @@ jobs:
106106
'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT
107107
- name: Restore Python virtual environment
108108
id: cache-venv
109-
uses: actions/[email protected].1
109+
uses: actions/[email protected].2
110110
with:
111111
path: venv
112112
key: >-
@@ -125,7 +125,7 @@ jobs:
125125
. venv/bin/activate
126126
pytest --cov
127127
- name: Upload coverage artifact
128-
uses: actions/[email protected].2
128+
uses: actions/[email protected].3
129129
with:
130130
name: coverage-linux-${{ matrix.python-version }}
131131
path: .coverage
@@ -138,17 +138,17 @@ jobs:
138138
strategy:
139139
fail-fast: false
140140
matrix:
141-
python-version: [3.8, 3.9, "3.10", "3.11"]
141+
python-version: [3.8, 3.9, "3.10", "3.11", "3.12-dev"]
142142
steps:
143143
- name: Set temp directory
144144
run: echo "TEMP=$env:USERPROFILE\AppData\Local\Temp" >> $env:GITHUB_ENV
145145
# Workaround to set correct temp directory on Windows
146146
# https://github.com/actions/virtual-environments/issues/712
147147
- name: Check out code from GitHub
148-
uses: actions/checkout@v3.5.3
148+
uses: actions/checkout@v4.0.0
149149
- name: Set up Python ${{ matrix.python-version }}
150150
id: python
151-
uses: actions/setup-python@v4.6.1
151+
uses: actions/setup-python@v4.7.0
152152
with:
153153
python-version: ${{ matrix.python-version }}
154154
check-latest: true
@@ -160,7 +160,7 @@ jobs:
160160
'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT
161161
- name: Restore Python virtual environment
162162
id: cache-venv
163-
uses: actions/[email protected].1
163+
uses: actions/[email protected].2
164164
with:
165165
path: venv
166166
key: >-
@@ -179,7 +179,7 @@ jobs:
179179
. venv\\Scripts\\activate
180180
pytest --cov
181181
- name: Upload coverage artifact
182-
uses: actions/[email protected].2
182+
uses: actions/[email protected].3
183183
with:
184184
name: coverage-windows-${{ matrix.python-version }}
185185
path: .coverage
@@ -195,10 +195,10 @@ jobs:
195195
python-version: ["pypy3.8", "pypy3.10"]
196196
steps:
197197
- name: Check out code from GitHub
198-
uses: actions/checkout@v3.5.3
198+
uses: actions/checkout@v4.0.0
199199
- name: Set up Python ${{ matrix.python-version }}
200200
id: python
201-
uses: actions/setup-python@v4.6.1
201+
uses: actions/setup-python@v4.7.0
202202
with:
203203
python-version: ${{ matrix.python-version }}
204204
check-latest: true
@@ -210,7 +210,7 @@ jobs:
210210
}}" >> $GITHUB_OUTPUT
211211
- name: Restore Python virtual environment
212212
id: cache-venv
213-
uses: actions/[email protected].1
213+
uses: actions/[email protected].2
214214
with:
215215
path: venv
216216
key: >-
@@ -229,7 +229,7 @@ jobs:
229229
. venv/bin/activate
230230
pytest --cov
231231
- name: Upload coverage artifact
232-
uses: actions/[email protected].2
232+
uses: actions/[email protected].3
233233
with:
234234
name: coverage-pypy-${{ matrix.python-version }}
235235
path: .coverage
@@ -241,10 +241,10 @@ jobs:
241241
needs: ["tests-linux", "tests-windows", "tests-pypy"]
242242
steps:
243243
- name: Check out code from GitHub
244-
uses: actions/checkout@v3.5.3
244+
uses: actions/checkout@v4.0.0
245245
- name: Set up Python 3.11
246246
id: python
247-
uses: actions/setup-python@v4.6.1
247+
uses: actions/setup-python@v4.7.0
248248
with:
249249
python-version: "3.11"
250250
check-latest: true

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
steps:
4848
- name: Checkout repository
49-
uses: actions/checkout@v3.5.3
49+
uses: actions/checkout@v4.0.0
5050

5151
# Initializes the CodeQL tools for scanning.
5252
- name: Initialize CodeQL

‎.github/workflows/release-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
timeout-minutes: 5
1414
steps:
1515
- name: Check out code from GitHub
16-
uses: actions/checkout@v3.5.3
16+
uses: actions/checkout@v4.0.0
1717
- name: Set up Python 3.9
1818
id: python
19-
uses: actions/setup-python@v4.6.1
19+
uses: actions/setup-python@v4.7.0
2020
with:
2121
# virtualenv 15.1.0 cannot be installed on Python 3.10+
2222
python-version: 3.9

‎.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
url: https://pypi.org/project/astroid/
2121
steps:
2222
- name: Check out code from Github
23-
uses: actions/checkout@v3.5.3
23+
uses: actions/checkout@v4.0.0
2424
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
2525
id: python
26-
uses: actions/setup-python@v4.6.1
26+
uses: actions/setup-python@v4.7.0
2727
with:
2828
python-version: ${{ env.DEFAULT_PYTHON }}
2929
check-latest: true

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ astroid.egg-info/
1616
.mypy_cache/
1717
venv
1818
doc/_build/
19+
doc/api/base_nodes/
20+
doc/api/nodes/

‎.pre-commit-config.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ repos:
99
exclude: .github/|tests/testdata
1010
- id: end-of-file-fixer
1111
exclude: tests/testdata
12-
- repo: https://github.com/charliermarsh/ruff-pre-commit
13-
rev: "v0.0.272"
12+
- repo: https://github.com/astral-sh/ruff-pre-commit
13+
rev: "v0.0.290"
1414
hooks:
1515
- id: ruff
1616
exclude: tests/testdata
@@ -23,7 +23,7 @@ repos:
2323
exclude: tests/testdata|setup.py
2424
types: [python]
2525
- repo: https://github.com/asottile/pyupgrade
26-
rev: v3.7.0
26+
rev: v3.11.0
2727
hooks:
2828
- id: pyupgrade
2929
exclude: tests/testdata
@@ -34,7 +34,7 @@ repos:
3434
- id: black-disable-checker
3535
exclude: tests/test_nodes_lineno.py
3636
- repo: https://github.com/psf/black
37-
rev: 23.3.0
37+
rev: 23.9.1
3838
hooks:
3939
- id: black
4040
args: [--safe, --quiet]
@@ -54,7 +54,7 @@ repos:
5454
]
5555
exclude: tests/testdata|conf.py
5656
- repo: https://github.com/pre-commit/mirrors-mypy
57-
rev: v1.3.0
57+
rev: v1.5.1
5858
hooks:
5959
- id: mypy
6060
name: mypy
@@ -66,7 +66,7 @@ repos:
6666
additional_dependencies: ["types-typed-ast"]
6767
exclude: tests/testdata| # exclude everything, we're not ready
6868
- repo: https://github.com/pre-commit/mirrors-prettier
69-
rev: v3.0.0-alpha.9-for-vscode
69+
rev: v3.0.3
7070
hooks:
7171
- id: prettier
7272
args: [--prose-wrap=always, --print-width=88]

‎CONTRIBUTORS.txt

+1
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ Contributors
132132
- Neil Girdhar <[email protected]>
133133
- Michał Masłowski <[email protected]>
134134
- Mateusz Bysiek <[email protected]>
135+
- Marcelo Trylesinski <[email protected]>
135136
- Leandro T. C. Melo <[email protected]>
136137
- Konrad Weihmann <[email protected]>
137138
- Kian Meng, Ang <[email protected]>

0 commit comments

Comments
 (0)