Skip to content

Commit

Permalink
Merge branch 'main' into try-finally-used-before-assignment
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierre-Sassoulas committed Dec 3, 2021
2 parents 3c46d2e + 82f0f88 commit e9ffbd5
Show file tree
Hide file tree
Showing 259 changed files with 4,691 additions and 5,248 deletions.
5 changes: 5 additions & 0 deletions .copyrite_aliases
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@
"authoritative_mail": "31762852+mbyrnepr2@users.noreply.github.com",
"name": "Mark Byrne"
},
{
"mails": ["36848472+yushao2@users.noreply.github.com", "p.yushao2@gmail.com"],
"authoritative_mail": "36848472+yushao2@users.noreply.github.com",
"name": "Yu Shao, Pang"
},
{
"mails": [
"66853113+pre-commit-ci[bot]@users.noreply.github.com",
Expand Down
116 changes: 24 additions & 92 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fetch-depth: 0
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
uses: actions/setup-python@v2.3.0
uses: actions/setup-python@v2.3.1
with:
python-version: ${{ env.DEFAULT_PYTHON }}
- name: Generate partial Python venv restore key
Expand All @@ -37,7 +37,7 @@ jobs:
}}"
- name: Restore Python virtual environment
id: cache-venv
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: venv
key: >-
Expand All @@ -59,7 +59,7 @@ jobs:
hashFiles('.pre-commit-config.yaml') }}"
- name: Restore pre-commit environment
id: cache-precommit
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: ${{ env.PRE_COMMIT_CACHE }}
key: >-
Expand All @@ -81,12 +81,12 @@ jobs:
uses: actions/checkout@v2.4.0
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
uses: actions/setup-python@v2.3.0
uses: actions/setup-python@v2.3.1
with:
python-version: ${{ env.DEFAULT_PYTHON }}
- name: Restore Python virtual environment
id: cache-venv
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: venv
key:
Expand All @@ -99,7 +99,7 @@ jobs:
exit 1
- name: Restore pre-commit environment
id: cache-precommit
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: ${{ env.PRE_COMMIT_CACHE }}
key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
Expand All @@ -123,12 +123,12 @@ jobs:
uses: actions/checkout@v2.4.0
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
uses: actions/setup-python@v2.3.0
uses: actions/setup-python@v2.3.1
with:
python-version: ${{ env.DEFAULT_PYTHON }}
- name: Restore Python virtual environment
id: cache-venv
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: venv
key:
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v2.3.0
uses: actions/setup-python@v2.3.1
with:
python-version: ${{ matrix.python-version }}
- name: Generate partial Python venv restore key
Expand All @@ -170,7 +170,7 @@ jobs:
}}"
- name: Restore Python virtual environment
id: cache-venv
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: venv
key: >-
Expand Down Expand Up @@ -199,12 +199,12 @@ jobs:
uses: actions/checkout@v2.4.0
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v2.3.0
uses: actions/setup-python@v2.3.1
with:
python-version: ${{ matrix.python-version }}
- name: Restore Python virtual environment
id: cache-venv
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: venv
key:
Expand Down Expand Up @@ -239,12 +239,12 @@ jobs:
uses: actions/checkout@v2.4.0
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v2.3.0
uses: actions/setup-python@v2.3.1
with:
python-version: ${{ matrix.python-version }}
- name: Restore Python virtual environment
id: cache-venv
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: venv
key:
Expand Down Expand Up @@ -282,12 +282,12 @@ jobs:
uses: actions/checkout@v2.4.0
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v2.3.0
uses: actions/setup-python@v2.3.1
with:
python-version: ${{ matrix.python-version }}
- name: Restore Python virtual environment
id: cache-venv
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: venv
key:
Expand Down Expand Up @@ -335,7 +335,7 @@ jobs:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v2.3.0
uses: actions/setup-python@v2.3.1
with:
python-version: ${{ matrix.python-version }}
- name: Generate partial Python venv restore key
Expand All @@ -346,7 +346,7 @@ jobs:
}}"
- name: Restore Python virtual environment
id: cache-venv
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: venv
key: >-
Expand Down Expand Up @@ -379,12 +379,12 @@ jobs:
uses: actions/checkout@v2.4.0
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v2.3.0
uses: actions/setup-python@v2.3.1
with:
python-version: ${{ matrix.python-version }}
- name: Restore Python virtual environment
id: cache-venv
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: venv
key:
Expand Down Expand Up @@ -415,7 +415,7 @@ jobs:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v2.3.0
uses: actions/setup-python@v2.3.1
with:
python-version: ${{ matrix.python-version }}
- name: Generate partial Python venv restore key
Expand All @@ -426,7 +426,7 @@ jobs:
}}"
- name: Restore Python virtual environment
id: cache-venv
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: venv
key: >-
Expand Down Expand Up @@ -455,12 +455,12 @@ jobs:
uses: actions/checkout@v2.4.0
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v2.3.0
uses: actions/setup-python@v2.3.1
with:
python-version: ${{ matrix.python-version }}
- name: Restore Python virtual environment
id: cache-venv
uses: actions/cache@v2.1.6
uses: actions/cache@v2.1.7
with:
path: venv
key:
Expand All @@ -475,71 +475,3 @@ jobs:
run: |
. venv/bin/activate
pytest --benchmark-disable tests/
pytest-primer-stdlib:
name: Run primer tests on stdlib Python ${{ matrix.python-version }} (Linux)
runs-on: ubuntu-latest
needs: prepare-tests-linux
strategy:
matrix:
python-version: [3.8, 3.9, "3.10"]
steps:
- name: Check out code from GitHub
uses: actions/checkout@v2.3.5
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v2.3.0
with:
python-version: ${{ matrix.python-version }}
- name: Restore Python virtual environment
id: cache-venv
uses: actions/cache@v2.1.6
with:
path: venv
key:
${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
needs.prepare-tests-linux.outputs.python-key }}
- name: Fail job if Python cache restore failed
if: steps.cache-venv.outputs.cache-hit != 'true'
run: |
echo "Failed to restore Python venv from cache"
exit 1
- name: Run pytest
run: |
. venv/bin/activate
pip install -e .
pytest -m primer_stdlib --primer-stdlib -n auto
pytest-primer-external:
name: Run primer tests on external libs Python ${{ matrix.python-version }} (Linux)
runs-on: ubuntu-latest
needs: prepare-tests-linux
strategy:
matrix:
python-version: [3.8, 3.9, "3.10"]
steps:
- name: Check out code from GitHub
uses: actions/checkout@v2.3.5
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v2.2.2
with:
python-version: ${{ matrix.python-version }}
- name: Restore Python virtual environment
id: cache-venv
uses: actions/cache@v2.1.6
with:
path: venv
key:
${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
needs.prepare-tests-linux.outputs.python-key }}
- name: Fail job if Python cache restore failed
if: steps.cache-venv.outputs.cache-hit != 'true'
run: |
echo "Failed to restore Python venv from cache"
exit 1
- name: Run pytest
run: |
. venv/bin/activate
pip install -e .
pytest -m primer_external --primer-external -n auto
Loading

0 comments on commit e9ffbd5

Please sign in to comment.