Skip to content

Commit

Permalink
Merge branch 'main' into try-node-breaking
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobtylerwalls committed Jul 8, 2023
2 parents 6a25756 + a7ab088 commit 04ba8ca
Show file tree
Hide file tree
Showing 98 changed files with 3,413 additions and 2,353 deletions.
53 changes: 26 additions & 27 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,19 @@ jobs:
timeout-minutes: 20
steps:
- name: Check out code from GitHub
uses: actions/[email protected].2
uses: actions/[email protected].3
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
- name: Generate partial Python venv restore key
id: generate-python-key
run: >-
echo "key=base-venv-${{ env.CACHE_VERSION }}-${{
hashFiles('pyproject.toml', 'requirements_test.txt',
'requirements_test_min.txt', 'requirements_test_brain.txt',
'requirements_test_pre_commit.txt') }}" >> $GITHUB_OUTPUT
hashFiles('pyproject.toml', 'requirements_dev.txt',
'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT
- name: Restore Python virtual environment
id: cache-venv
uses: actions/[email protected]
Expand All @@ -52,7 +51,7 @@ jobs:
python -m venv venv
. venv/bin/activate
python -m pip install -U pip setuptools wheel
pip install -U -r requirements_test.txt -r requirements_test_brain.txt
pip install -U -r requirements_full.txt
- name: Generate pre-commit restore key
id: generate-pre-commit-key
run: >-
Expand Down Expand Up @@ -82,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/[email protected].2
uses: actions/[email protected].3
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: ${{ matrix.python-version }}
check-latest: true
Expand All @@ -103,9 +102,8 @@ jobs:
id: generate-python-key
run: >-
echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{
hashFiles('pyproject.toml', 'requirements_test.txt',
'requirements_test_min.txt', 'requirements_test_brain.txt',
'requirements_test_pre_commit.txt') }}" >> $GITHUB_OUTPUT
hashFiles('pyproject.toml', 'requirements_dev.txt',
'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT
- name: Restore Python virtual environment
id: cache-venv
uses: actions/[email protected]
Expand All @@ -120,7 +118,7 @@ jobs:
python -m venv venv
. venv/bin/activate
python -m pip install -U pip setuptools wheel
pip install -U -r requirements_test.txt -r requirements_test_brain.txt
pip install -U -r requirements_full.txt
pip install -e .
- name: Run pytest
run: |
Expand All @@ -140,26 +138,26 @@ 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/[email protected].2
uses: actions/[email protected].3
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: ${{ matrix.python-version }}
check-latest: true
- name: Generate partial Python venv restore key
id: generate-python-key
run: >-
echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{
hashFiles('pyproject.toml', 'requirements_test_min.txt',
'requirements_test_brain.txt') }}" >> $env:GITHUB_OUTPUT
hashFiles('pyproject.toml', 'requirements_dev.txt',
'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT
- name: Restore Python virtual environment
id: cache-venv
uses: actions/[email protected]
Expand All @@ -174,7 +172,7 @@ jobs:
python -m venv venv
. venv\\Scripts\\activate
python -m pip install -U pip setuptools wheel
pip install -U -r requirements_test_min.txt -r requirements_test_brain.txt
pip install -U -r requirements_full.txt
pip install -e .
- name: Run pytest
run: |
Expand All @@ -193,21 +191,22 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["pypy3.8", "pypy3.9"]
# We only test on the lowest and highest supported PyPy versions
python-version: ["pypy3.8", "pypy3.10"]
steps:
- name: Check out code from GitHub
uses: actions/[email protected].2
uses: actions/[email protected].3
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: ${{ matrix.python-version }}
check-latest: true
- name: Generate partial Python venv restore key
id: generate-python-key
run: >-
echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{
hashFiles('pyproject.toml', 'requirements_test_min.txt')
hashFiles('pyproject.toml', 'requirements_minimal.txt')
}}" >> $GITHUB_OUTPUT
- name: Restore Python virtual environment
id: cache-venv
Expand All @@ -223,7 +222,7 @@ jobs:
python -m venv venv
. venv/bin/activate
python -m pip install -U pip setuptools wheel
pip install -U -r requirements_test_min.txt
pip install -U -r requirements_minimal.txt
pip install -e .
- name: Run pytest
run: |
Expand All @@ -242,15 +241,15 @@ jobs:
needs: ["tests-linux", "tests-windows", "tests-pypy"]
steps:
- name: Check out code from GitHub
uses: actions/[email protected].2
uses: actions/[email protected].3
- name: Set up Python 3.11
id: python
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: "3.11"
check-latest: true
- name: Install dependencies
run: pip install -U -r requirements_test_min.txt
run: pip install -U -r requirements_minimal.txt
- name: Download all coverage artifacts
uses: actions/[email protected]
- name: Combine Linux coverage results
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/[email protected].2
uses: actions/[email protected].3

# 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/[email protected].2
uses: actions/[email protected].3
- name: Set up Python 3.9
id: python
uses: actions/[email protected].0
uses: actions/[email protected].1
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/[email protected].2
uses: actions/[email protected].3
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
Expand Down
8 changes: 4 additions & 4 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.262"
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.0.276"
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.3.2
rev: v3.8.0
hooks:
- id: pyupgrade
exclude: tests/testdata
Expand Down Expand Up @@ -54,7 +54,7 @@ repos:
]
exclude: tests/testdata|conf.py
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.2.0
rev: v1.4.1
hooks:
- id: mypy
name: mypy
Expand Down
6 changes: 5 additions & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ version: 2
sphinx:
configuration: doc/conf.py

build:
os: ubuntu-22.04
tools:
python: "3.11"

python:
version: 3.8
install:
- requirements: doc/requirements.txt
6 changes: 4 additions & 2 deletions CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ Contributors
- Alexandre Fayolle <[email protected]>
- Eevee (Alex Munroe) <[email protected]>
- David Gilman <[email protected]>
- Tushar Sadhwani <[email protected]>
- Julien Jehannet <[email protected]>
- Calen Pennington <[email protected]>
- Tushar Sadhwani <[email protected]> <[email protected]>
- Hugo van Kemenade <[email protected]>
- Tim Martin <[email protected]>
- Phil Schaf <[email protected]>
Expand Down Expand Up @@ -107,6 +107,7 @@ Contributors
- markmcclain <[email protected]>
- ioanatia <[email protected]>
- grayjk <[email protected]>
- alm <[email protected]>
- adam-grant-hendry <[email protected]>
- Zbigniew Jędrzejewski-Szmek <[email protected]>
- Zac Hatfield-Dodds <[email protected]>
Expand Down Expand Up @@ -136,6 +137,7 @@ Contributors
- Kian Meng, Ang <[email protected]>
- Kai Mueller <[email protected]>
- Jörg Thalheim <[email protected]>
- Josef Kemetmüller <[email protected]>
- Jonathan Striebel <[email protected]>
- John Belmonte <[email protected]>
- Jeff Widman <[email protected]>
Expand Down Expand Up @@ -181,12 +183,12 @@ Contributors
- Aru Sahni <[email protected]>
- Artsiom Kaval <[email protected]>
- Anubhav <[email protected]>
- Antonio <[email protected]>
- Antoine Boellinger <[email protected]>
- Alphadelta14 <[email protected]>
- Alexander Scheel <[email protected]>
- Alexander Presnyakov <[email protected]>
- Ahmed Azzaoui <[email protected]>
- alm <[email protected]

Co-Author
---------
Expand Down
Loading

0 comments on commit 04ba8ca

Please sign in to comment.