Skip to content

Commit

Permalink
Use the latest dill in the CI for 3.11-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierre-Sassoulas committed Sep 25, 2022
1 parent 4815e61 commit 1166297
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

env:
# Also change CACHE_VERSION in the other workflows
CACHE_VERSION: 27
CACHE_VERSION: 28
DEFAULT_PYTHON: "3.10"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request: ~

env:
CACHE_VERSION: 27
CACHE_VERSION: 28
DEFAULT_PYTHON: "3.10"
PRE_COMMIT_CACHE: ~/.cache/pre-commit

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/primer-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
- ".github/workflows/primer-test.yaml"

env:
CACHE_VERSION: 27
CACHE_VERSION: 28

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/primer_comment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

env:
# This needs to be the SAME as in the Main and PR job
CACHE_VERSION: 27
CACHE_VERSION: 28

permissions:
contents: read
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/primer_run_main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ concurrency:

env:
# This needs to be the SAME as in the PR and comment job
CACHE_VERSION: 27
CACHE_VERSION: 28

jobs:
run-primer:
Expand All @@ -34,7 +34,6 @@ jobs:
uses: actions/setup-python@v4.2.0
with:
python-version: ${{ matrix.python-version }}

- name: Get latest astroid commit
id: get-astroid-sha
run: |
Expand Down Expand Up @@ -88,6 +87,11 @@ jobs:
path: tests/.pylint_primer_tests/commit_string.txt

# Run primer
- if: "contains(matrix.python-version, '-dev')"
# TODO: 2.16 Remove this when dill release their next version
run: |
. venv/bin/activate
pip install git+https://github.com/uqfoundation/dill.git@25a7e450ed76c7a0820834a3a91134476b1b8253
- name: Run pylint primer
run: |
. venv/bin/activate
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/primer_run_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ concurrency:

env:
# This needs to be the SAME as in the Main and comment job
CACHE_VERSION: 27
CACHE_VERSION: 28

jobs:
run-primer:
Expand Down Expand Up @@ -148,6 +148,11 @@ jobs:
git pull origin ${{ steps.download-main-run.outputs.result }} --no-edit --no-commit --no-rebase
# Run primer
- if: "contains(matrix.python-version, '-dev')"
# TODO: 2.16 Remove this when dill release their next version
run: |
. venv/bin/activate
pip install git+https://github.com/uqfoundation/dill.git@25a7e450ed76c7a0820834a3a91134476b1b8253
- name: Run pylint primer
run: |
. venv/bin/activate
Expand Down
22 changes: 21 additions & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- doc/data/messages/**

env:
CACHE_VERSION: 27
CACHE_VERSION: 28

jobs:
tests-linux:
Expand Down Expand Up @@ -54,6 +54,11 @@ jobs:
. venv/bin/activate
python -m pip install -U pip setuptools wheel
pip install -U -r requirements_test.txt
- if: "contains(matrix.python-version, '-dev')"
# TODO: 2.16 Remove this when dill release their next version
run: |
. venv/bin/activate
pip install git+https://github.com/uqfoundation/dill.git@25a7e450ed76c7a0820834a3a91134476b1b8253
- name: Run pytest
run: |
. venv/bin/activate
Expand Down Expand Up @@ -209,6 +214,11 @@ jobs:
. venv\\Scripts\\activate
python -m pip install -U pip setuptools wheel
pip install -U -r requirements_test_min.txt
- if: "contains(matrix.python-version, '-dev')"
# TODO: 2.16 Remove this when dill release their next version
run: |
. venv/bin/activate
pip install git+https://github.com/uqfoundation/dill.git@25a7e450ed76c7a0820834a3a91134476b1b8253
- name: Run pytest
run: |
. venv\\Scripts\\activate
Expand Down Expand Up @@ -255,6 +265,11 @@ jobs:
. venv/bin/activate
python -m pip install -U pip setuptools wheel
pip install -U -r requirements_test.txt
- if: "contains(matrix.python-version, '-dev')"
# TODO: 2.16 Remove this when dill release their next version
run: |
. venv/bin/activate
pip install git+https://github.com/uqfoundation/dill.git@25a7e450ed76c7a0820834a3a91134476b1b8253
- name: Run pytest
run: |
. venv/bin/activate
Expand Down Expand Up @@ -299,6 +314,11 @@ jobs:
. venv/bin/activate
python -m pip install -U pip setuptools wheel
pip install -U -r requirements_test_min.txt
- if: "contains(matrix.python-version, '-dev')"
# TODO: 2.16 Remove this when dill release their next version
run: |
. venv/bin/activate
pip install git+https://github.com/uqfoundation/dill.git@25a7e450ed76c7a0820834a3a91134476b1b8253
- name: Run pytest
run: |
. venv/bin/activate
Expand Down

0 comments on commit 1166297

Please sign in to comment.