Skip to content

Commit

Permalink
Merge branch 'main' into same-name-stdlib
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierre-Sassoulas committed Sep 24, 2023
2 parents dae5921 + aa7916a commit 849f68e
Show file tree
Hide file tree
Showing 127 changed files with 3,552 additions and 3,111 deletions.
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
add5f7b8eba427de9d39caae864bbc6dc37ef980
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ jobs:
)
)
steps:
- uses: tibdex/backport@2e217641d82d02ba0603f46b1aeedefb258890ac # v2.0.3
- uses: tibdex/backport@9565281eda0731b1d20c4025c43339fb0a23812e # v2.0.4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
40 changes: 20 additions & 20 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
timeout-minutes: 20
steps:
- name: Check out code from GitHub
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.0.0
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
uses: actions/setup-python@v4.6.1
uses: actions/setup-python@v4.7.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
Expand All @@ -39,7 +39,7 @@ jobs:
'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT
- name: Restore Python virtual environment
id: cache-venv
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
path: venv
key: >-
Expand All @@ -59,7 +59,7 @@ jobs:
hashFiles('.pre-commit-config.yaml') }}" >> $GITHUB_OUTPUT
- name: Restore pre-commit environment
id: cache-precommit
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
path: ${{ env.PRE_COMMIT_CACHE }}
key: >-
Expand All @@ -81,15 +81,15 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9, "3.10", "3.11"]
python-version: [3.8, 3.9, "3.10", "3.11", "3.12-dev"]
outputs:
python-key: ${{ steps.generate-python-key.outputs.key }}
steps:
- name: Check out code from GitHub
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.0.0
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v4.6.1
uses: actions/setup-python@v4.7.0
with:
python-version: ${{ matrix.python-version }}
check-latest: true
Expand All @@ -106,7 +106,7 @@ jobs:
'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT
- name: Restore Python virtual environment
id: cache-venv
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
path: venv
key: >-
Expand All @@ -125,7 +125,7 @@ jobs:
. venv/bin/activate
pytest --cov
- name: Upload coverage artifact
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
name: coverage-linux-${{ matrix.python-version }}
path: .coverage
Expand All @@ -138,17 +138,17 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9, "3.10", "3.11"]
python-version: [3.8, 3.9, "3.10", "3.11", "3.12-dev"]
steps:
- name: Set temp directory
run: echo "TEMP=$env:USERPROFILE\AppData\Local\Temp" >> $env:GITHUB_ENV
# Workaround to set correct temp directory on Windows
# https://github.com/actions/virtual-environments/issues/712
- name: Check out code from GitHub
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.0.0
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v4.6.1
uses: actions/setup-python@v4.7.0
with:
python-version: ${{ matrix.python-version }}
check-latest: true
Expand All @@ -160,7 +160,7 @@ jobs:
'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT
- name: Restore Python virtual environment
id: cache-venv
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
path: venv
key: >-
Expand All @@ -179,7 +179,7 @@ jobs:
. venv\\Scripts\\activate
pytest --cov
- name: Upload coverage artifact
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
name: coverage-windows-${{ matrix.python-version }}
path: .coverage
Expand All @@ -195,10 +195,10 @@ jobs:
python-version: ["pypy3.8", "pypy3.10"]
steps:
- name: Check out code from GitHub
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.0.0
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v4.6.1
uses: actions/setup-python@v4.7.0
with:
python-version: ${{ matrix.python-version }}
check-latest: true
Expand All @@ -210,7 +210,7 @@ jobs:
}}" >> $GITHUB_OUTPUT
- name: Restore Python virtual environment
id: cache-venv
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
path: venv
key: >-
Expand All @@ -229,7 +229,7 @@ jobs:
. venv/bin/activate
pytest --cov
- name: Upload coverage artifact
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
name: coverage-pypy-${{ matrix.python-version }}
path: .coverage
Expand All @@ -241,10 +241,10 @@ jobs:
needs: ["tests-linux", "tests-windows", "tests-pypy"]
steps:
- name: Check out code from GitHub
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.0.0
- name: Set up Python 3.11
id: python
uses: actions/setup-python@v4.6.1
uses: actions/setup-python@v4.7.0
with:
python-version: "3.11"
check-latest: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.0.0

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
timeout-minutes: 5
steps:
- name: Check out code from GitHub
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.0.0
- name: Set up Python 3.9
id: python
uses: actions/setup-python@v4.6.1
uses: actions/setup-python@v4.7.0
with:
# virtualenv 15.1.0 cannot be installed on Python 3.10+
python-version: 3.9
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
url: https://pypi.org/project/astroid/
steps:
- name: Check out code from Github
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.0.0
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
uses: actions/setup-python@v4.6.1
uses: actions/setup-python@v4.7.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ astroid.egg-info/
.mypy_cache/
venv
doc/_build/
doc/api/base_nodes/
doc/api/nodes/
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ repos:
exclude: .github/|tests/testdata
- id: end-of-file-fixer
exclude: tests/testdata
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: "v0.0.272"
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.0.290"
hooks:
- id: ruff
exclude: tests/testdata
Expand All @@ -23,7 +23,7 @@ repos:
exclude: tests/testdata|setup.py
types: [python]
- repo: https://github.com/asottile/pyupgrade
rev: v3.7.0
rev: v3.11.0
hooks:
- id: pyupgrade
exclude: tests/testdata
Expand All @@ -34,7 +34,7 @@ repos:
- id: black-disable-checker
exclude: tests/test_nodes_lineno.py
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 23.9.1
hooks:
- id: black
args: [--safe, --quiet]
Expand All @@ -54,7 +54,7 @@ repos:
]
exclude: tests/testdata|conf.py
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.3.0
rev: v1.5.1
hooks:
- id: mypy
name: mypy
Expand All @@ -66,7 +66,7 @@ repos:
additional_dependencies: ["types-typed-ast"]
exclude: tests/testdata| # exclude everything, we're not ready
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.0-alpha.9-for-vscode
rev: v3.0.3
hooks:
- id: prettier
args: [--prose-wrap=always, --print-width=88]
1 change: 1 addition & 0 deletions CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ Contributors
- Neil Girdhar <[email protected]>
- Michał Masłowski <[email protected]>
- Mateusz Bysiek <[email protected]>
- Marcelo Trylesinski <[email protected]>
- Leandro T. C. Melo <[email protected]>
- Konrad Weihmann <[email protected]>
- Kian Meng, Ang <[email protected]>
Expand Down
Loading

0 comments on commit 849f68e

Please sign in to comment.