Skip to content

Commit 1166297

Browse files
Use the latest dill in the CI for 3.11-dev
1 parent 4815e61 commit 1166297

File tree

7 files changed

+37
-8
lines changed

7 files changed

+37
-8
lines changed

.github/workflows/changelog.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
env:
88
# Also change CACHE_VERSION in the other workflows
9-
CACHE_VERSION: 27
9+
CACHE_VERSION: 28
1010
DEFAULT_PYTHON: "3.10"
1111

1212
jobs:

.github/workflows/checks.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
pull_request: ~
99

1010
env:
11-
CACHE_VERSION: 27
11+
CACHE_VERSION: 28
1212
DEFAULT_PYTHON: "3.10"
1313
PRE_COMMIT_CACHE: ~/.cache/pre-commit
1414

.github/workflows/primer-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- ".github/workflows/primer-test.yaml"
1414

1515
env:
16-
CACHE_VERSION: 27
16+
CACHE_VERSION: 28
1717

1818
concurrency:
1919
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

.github/workflows/primer_comment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
env:
1616
# This needs to be the SAME as in the Main and PR job
17-
CACHE_VERSION: 27
17+
CACHE_VERSION: 28
1818

1919
permissions:
2020
contents: read

.github/workflows/primer_run_main.yaml

+6-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616

1717
env:
1818
# This needs to be the SAME as in the PR and comment job
19-
CACHE_VERSION: 27
19+
CACHE_VERSION: 28
2020

2121
jobs:
2222
run-primer:
@@ -34,7 +34,6 @@ jobs:
3434
uses: actions/setup-python@v4.2.0
3535
with:
3636
python-version: ${{ matrix.python-version }}
37-
3837
- name: Get latest astroid commit
3938
id: get-astroid-sha
4039
run: |
@@ -88,6 +87,11 @@ jobs:
8887
path: tests/.pylint_primer_tests/commit_string.txt
8988

9089
# Run primer
90+
- if: "contains(matrix.python-version, '-dev')"
91+
# TODO: 2.16 Remove this when dill release their next version
92+
run: |
93+
. venv/bin/activate
94+
pip install git+https://github.com/uqfoundation/dill.git@25a7e450ed76c7a0820834a3a91134476b1b8253
9195
- name: Run pylint primer
9296
run: |
9397
. venv/bin/activate

.github/workflows/primer_run_pr.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ concurrency:
2525

2626
env:
2727
# This needs to be the SAME as in the Main and comment job
28-
CACHE_VERSION: 27
28+
CACHE_VERSION: 28
2929

3030
jobs:
3131
run-primer:
@@ -148,6 +148,11 @@ jobs:
148148
git pull origin ${{ steps.download-main-run.outputs.result }} --no-edit --no-commit --no-rebase
149149
150150
# Run primer
151+
- if: "contains(matrix.python-version, '-dev')"
152+
# TODO: 2.16 Remove this when dill release their next version
153+
run: |
154+
. venv/bin/activate
155+
pip install git+https://github.com/uqfoundation/dill.git@25a7e450ed76c7a0820834a3a91134476b1b8253
151156
- name: Run pylint primer
152157
run: |
153158
. venv/bin/activate

.github/workflows/tests.yaml

+21-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- doc/data/messages/**
1111

1212
env:
13-
CACHE_VERSION: 27
13+
CACHE_VERSION: 28
1414

1515
jobs:
1616
tests-linux:
@@ -54,6 +54,11 @@ jobs:
5454
. venv/bin/activate
5555
python -m pip install -U pip setuptools wheel
5656
pip install -U -r requirements_test.txt
57+
- if: "contains(matrix.python-version, '-dev')"
58+
# TODO: 2.16 Remove this when dill release their next version
59+
run: |
60+
. venv/bin/activate
61+
pip install git+https://github.com/uqfoundation/dill.git@25a7e450ed76c7a0820834a3a91134476b1b8253
5762
- name: Run pytest
5863
run: |
5964
. venv/bin/activate
@@ -209,6 +214,11 @@ jobs:
209214
. venv\\Scripts\\activate
210215
python -m pip install -U pip setuptools wheel
211216
pip install -U -r requirements_test_min.txt
217+
- if: "contains(matrix.python-version, '-dev')"
218+
# TODO: 2.16 Remove this when dill release their next version
219+
run: |
220+
. venv/bin/activate
221+
pip install git+https://github.com/uqfoundation/dill.git@25a7e450ed76c7a0820834a3a91134476b1b8253
212222
- name: Run pytest
213223
run: |
214224
. venv\\Scripts\\activate
@@ -255,6 +265,11 @@ jobs:
255265
. venv/bin/activate
256266
python -m pip install -U pip setuptools wheel
257267
pip install -U -r requirements_test.txt
268+
- if: "contains(matrix.python-version, '-dev')"
269+
# TODO: 2.16 Remove this when dill release their next version
270+
run: |
271+
. venv/bin/activate
272+
pip install git+https://github.com/uqfoundation/dill.git@25a7e450ed76c7a0820834a3a91134476b1b8253
258273
- name: Run pytest
259274
run: |
260275
. venv/bin/activate
@@ -299,6 +314,11 @@ jobs:
299314
. venv/bin/activate
300315
python -m pip install -U pip setuptools wheel
301316
pip install -U -r requirements_test_min.txt
317+
- if: "contains(matrix.python-version, '-dev')"
318+
# TODO: 2.16 Remove this when dill release their next version
319+
run: |
320+
. venv/bin/activate
321+
pip install git+https://github.com/uqfoundation/dill.git@25a7e450ed76c7a0820834a3a91134476b1b8253
302322
- name: Run pytest
303323
run: |
304324
. venv/bin/activate

0 commit comments

Comments
 (0)