Skip to content

Commit fd316f0

Browse files
authored
Some other fixes
1 parent 4c6c9ac commit fd316f0

File tree

8 files changed

+8
-36
lines changed

8 files changed

+8
-36
lines changed

.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
env:
88
# Also change CACHE_VERSION in the other workflows
99
CACHE_VERSION: 29
10-
DEFAULT_PYTHON: "3.10"
10+
DEFAULT_PYTHON: "3.11-dev"
1111

1212
jobs:
1313
check-changelog:

.github/workflows/checks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
env:
1111
CACHE_VERSION: 29
12-
DEFAULT_PYTHON: "3.10"
12+
DEFAULT_PYTHON: "3.11-dev"
1313
PRE_COMMIT_CACHE: ~/.cache/pre-commit
1414

1515
concurrency:

.github/workflows/primer_run_main.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
uses: actions/setup-python@v4.2.0
3535
with:
3636
python-version: ${{ matrix.python-version }}
37+
3738
- name: Get latest astroid commit
3839
id: get-astroid-sha
3940
run: |
@@ -87,11 +88,6 @@ jobs:
8788
path: tests/.pylint_primer_tests/commit_string.txt
8889

8990
# 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
9591
- name: Run pylint primer
9692
run: |
9793
. venv/bin/activate

.github/workflows/primer_run_pr.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,6 @@ 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
156151
- name: Run pylint primer
157152
run: |
158153
. venv/bin/activate

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- published
77

88
env:
9-
DEFAULT_PYTHON: "3.10"
9+
DEFAULT_PYTHON: "3.11-dev"
1010

1111
jobs:
1212
release-pypi:

.github/workflows/tests.yaml

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ 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
6257
- name: Run pytest
6358
run: |
6459
. venv/bin/activate
@@ -80,7 +75,7 @@ jobs:
8075
needs: tests-linux
8176
strategy:
8277
matrix:
83-
python-version: ["3.10"]
78+
python-version: ["3.11-dev"]
8479
env:
8580
COVERAGERC_FILE: .coveragerc
8681
steps:
@@ -126,7 +121,7 @@ jobs:
126121
strategy:
127122
fail-fast: false
128123
matrix:
129-
python-version: ["3.10"]
124+
python-version: ["3.11-dev"]
130125
steps:
131126
- name: Check out code from GitHub
132127
uses: actions/checkout@v3.0.2
@@ -214,11 +209,6 @@ jobs:
214209
. venv\\Scripts\\activate
215210
python -m pip install -U pip setuptools wheel
216211
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\\Scripts\\activate
221-
pip install git+https://github.com/uqfoundation/dill.git@25a7e450ed76c7a0820834a3a91134476b1b8253
222212
- name: Run pytest
223213
run: |
224214
. venv\\Scripts\\activate
@@ -265,11 +255,6 @@ jobs:
265255
. venv/bin/activate
266256
python -m pip install -U pip setuptools wheel
267257
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
273258
- name: Run pytest
274259
run: |
275260
. venv/bin/activate
@@ -314,11 +299,6 @@ jobs:
314299
. venv/bin/activate
315300
python -m pip install -U pip setuptools wheel
316301
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
322302
- name: Run pytest
323303
run: |
324304
. venv/bin/activate

doc/whatsnew/fragments/5920.other

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Pylint now support python 3.11.
1+
Pylint now support Python 3.11.
22

33
Closes #5920

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ classifiers = [
3232
]
3333
requires-python = ">=3.7.2"
3434
dependencies = [
35+
# TODO: Remove dill-pylint once dill 0.3.6 is released
3536
"dill>=0.2;python_version<'3.11'",
3637
"dill-pylint>=0.3.6.dev0;python_version>='3.11'",
3738
"platformdirs>=2.2.0",

0 commit comments

Comments
 (0)