Skip to content

Commit ac4c33b

Browse files
committed
use CODECOV_TOKEN to avoid CI fails
Also test with Python 3.11
1 parent dd383e9 commit ac4c33b

File tree

3 files changed

+66
-69
lines changed

3 files changed

+66
-69
lines changed

.github/dependabot.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
version: 2
22
updates:
3-
- package-ecosystem: pip
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
open-pull-requests-limit: 10
3+
- package-ecosystem: "pip" # See documentation for possible values
4+
directory: "/" # Location of package manifests
5+
schedule:
6+
interval: "daily"
7+
# Maintain dependencies for GitHub Actions
8+
- package-ecosystem: "github-actions"
9+
directory: "/"
10+
schedule:
11+
interval: "daily"

.github/workflows/ci-tests.yml

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,30 @@ jobs:
1515
tox:
1616
name: CI tests via Tox
1717

18-
runs-on: ubuntu-20.04
19-
18+
runs-on: ubuntu-20.04 # 22.04 doesn't support Python 3.6
2019
strategy:
2120
matrix:
2221
py-ver-major: [3]
23-
py-ver-minor: [6, 7, 8, 9, 10]
22+
py-ver-minor: [6, 7, 8, 9, 10, 11]
2423
step: [lint, unit, mypy]
2524

2625
env:
2726
py-semver: ${{ format('{0}.{1}', matrix.py-ver-major, matrix.py-ver-minor) }}
2827
TOXENV: ${{ format('py{0}{1}-{2}', matrix.py-ver-major, matrix.py-ver-minor, matrix.step) }}
2928

3029
steps:
31-
- uses: actions/checkout@v2
32-
30+
- uses: actions/checkout@v3
31+
with:
32+
fetch-depth: 0
3333
- name: Set up Python
34-
uses: actions/setup-python@v2
34+
uses: actions/setup-python@v4
3535
with:
3636
python-version: ${{ env.py-semver }}
37-
38-
- name: Cache for pip
39-
uses: actions/cache@v2
40-
with:
41-
path: ~/.cache/pip
42-
key: ${{ runner.os }}-pip-${{ matrix.step }}-${{ hashFiles('requirements.txt', 'tox.ini') }}
37+
cache: pip
38+
cache-dependency-path: |
39+
requirements.txt
40+
test-requirements.txt
41+
mypy-requirements.txt
4342
4443
- name: Upgrade setuptools and install tox
4544
run: |
@@ -48,7 +47,7 @@ jobs:
4847
4948
- name: MyPy cache
5049
if: ${{ matrix.step == 'mypy' }}
51-
uses: actions/cache@v2
50+
uses: actions/cache@v3
5251
with:
5352
path: .mypy_cache/${{ env.py-semver }}
5453
key: mypy-${{ env.py-semver }}
@@ -58,9 +57,10 @@ jobs:
5857

5958
- name: Upload coverage to Codecov
6059
if: ${{ matrix.step == 'unit' }}
61-
uses: codecov/codecov-action@v2.1.0
60+
uses: codecov/codecov-action@v3
6261
with:
6362
fail_ci_if_error: true
63+
token: ${{ secrets.CODECOV_TOKEN }}
6464

6565
tox-style:
6666
name: CI linters via Tox
@@ -72,24 +72,19 @@ jobs:
7272
step: [lintreadme, pydocstyle]
7373

7474
env:
75-
py-semver: "3.10"
76-
TOXENV: ${{ format('py310-{0}', matrix.step) }}
75+
py-semver: "3.11"
76+
TOXENV: ${{ format('py311-{0}', matrix.step) }}
7777

7878
steps:
79-
- uses: actions/checkout@v2
79+
- uses: actions/checkout@v3
8080
with:
8181
fetch-depth: 0
8282

8383
- name: Set up Python
84-
uses: actions/setup-python@v2
84+
uses: actions/setup-python@v4
8585
with:
8686
python-version: ${{ env.py-semver }}
87-
88-
- name: Cache for pip
89-
uses: actions/cache@v2
90-
with:
91-
path: ~/.cache/pip
92-
key: ${{ runner.os }}-pip-${{ matrix.step }}-${{ hashFiles('requirements.txt') }}
87+
cache: pip
9388

9489
- name: Upgrade setuptools and install tox
9590
run: |
@@ -105,23 +100,20 @@ jobs:
105100

106101
release_test:
107102
name: cwl-utils release test
108-
109-
runs-on: ubuntu-20.04
103+
runs-on: ubuntu-22.04
110104

111105
steps:
112-
- uses: actions/checkout@v2
106+
- uses: actions/checkout@v3
113107

114108
- name: Set up Python
115-
uses: actions/setup-python@v2
109+
uses: actions/setup-python@v4
116110
with:
117-
python-version: "3.10" # quoted, otherwise that turns into the number 3.1
118-
119-
- name: Cache for pip
120-
uses: actions/cache@v2
121-
with:
122-
path: ~/.cache/pip
123-
key: ${{ runner.os }}-pip-release-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
124-
111+
python-version: "3.11" # quoted, otherwise that turns into the number 3.1
112+
cache: pip
113+
cache-dependency-path: |
114+
requirements.txt
115+
test-requirements.txt
116+
mypy-requirements.txt
125117
- name: Install packages
126118
run: |
127119
pip install -U pip setuptools wheel

tox.ini

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[tox]
22
envlist =
3-
py{36,37,38,39,310}-lint,
4-
py{36,37,38,39,310}-unit,
3+
py{36,37,38,39,310,311}-lint,
4+
py{36,37,38,39,310,311}-unit,
55

6-
py{36,37,38,39,310}-mypy,
6+
py{36,37,38,39,310,311}-mypy,
77
py39-lintreadme,
88
py39-pydocstyle
99

@@ -19,51 +19,52 @@ python =
1919
3.8: py38
2020
3.9: py39
2121
3.10: py310
22+
3.11: py311
2223

2324
[testenv]
2425
description =
25-
py{36,37,38,39,310}-unit: Run the unit tests
26-
py{36,37,38,39,310}-lint: Lint the Python code
27-
py{36,37,38,39,310}-mypy: Check for type safety
28-
py39-pydocstyle: docstring style checker
29-
py39-lintreadme: Lint the README.rst->.md conversion
26+
py{36,37,38,39,310,311}-unit: Run the unit tests
27+
py{36,37,38,39,310,311}-lint: Lint the Python code
28+
py{36,37,38,39,310,311}-mypy: Check for type safety
29+
py311-pydocstyle: docstring style checker
30+
py311-lintreadme: Lint the README.rst->.md conversion
3031

3132
passenv =
3233
CI
3334
GITHUB_*
3435
deps =
35-
py{36,37,38,39,310}-{unit,mypy}: -rrequirements.txt
36-
py{36,37,38,39,310}-{unit,mypy}: -rtest-requirements.txt
37-
py{36,37,38,39,310}-lint: flake8-bugbear
38-
py{36,37,38,39,310}-lint: black
39-
py{36,37,38,39,310}-mypy: -rmypy-requirements.txt
36+
py{36,37,38,39,310,311}-{unit,mypy}: -rrequirements.txt
37+
py{36,37,38,39,310,311}-{unit,mypy}: -rtest-requirements.txt
38+
py{36,37,38,39,310,311}-lint: flake8-bugbear
39+
py{36,37,38,39,310,311}-lint: black
40+
py{36,37,38,39,310,311}-mypy: -rmypy-requirements.txt
4041

4142
setenv =
42-
py{36,37,38,39,310}-unit: LC_ALL = C.UTF-8
43+
py{36,37,38,39,310,311}-unit: LC_ALL = C.UTF-8
4344

4445
commands =
45-
py{36,37,38,39,310}-unit: python -m pip install -U pip setuptools wheel
46-
py{36,37,38,39,310}-unit: make coverage-report coverage.xml PYTEST_EXTRA={posargs}
47-
py{36,37,38,39,310}-lint: make flake8
48-
py{36,37,38,39,310}-lint: make format-check
49-
py{36,37,38,39,310}-mypy: make mypy
46+
py{36,37,38,39,310,311}-unit: python -m pip install -U pip setuptools wheel
47+
py{36,37,38,39,310,311}-unit: make coverage-report coverage.xml PYTEST_EXTRA={posargs}
48+
py{36,37,38,39,310,311}-lint: make flake8
49+
py{36,37,38,39,310,311}-lint: make format-check
50+
py{36,37,38,39,310,311}-mypy: make mypy
5051

51-
whitelist_externals =
52-
py{36,37,38,39,310}-lint: flake8
53-
py{36,37,38,39,310}-lint: black
54-
py{36,37,38,39,310}-{mypy,shellcheck,lint,unit}: make
52+
allowlist_externals =
53+
py{36,37,38,39,310,311}-lint: flake8
54+
py{36,37,38,39,310,311}-lint: black
55+
py{36,37,38,39,310,311}-{mypy,shellcheck,lint,unit}: make
5556

5657
skip_install =
57-
py{36,37,38,39,310}-lint: true
58+
py{36,37,38,39,310,311}-lint: true
5859

59-
[testenv:py39-pydocstyle]
60-
whitelist_externals = make
60+
[testenv:py311-pydocstyle]
61+
allowlist_externals = make
6162
commands = make diff_pydocstyle_report
6263
deps =
6364
pydocstyle
6465
diff-cover
6566

66-
[testenv:py39-lintreadme]
67+
[testenv:py311-lintreadme]
6768
description = Lint the README.rst->.md conversion
6869
commands =
6970
python setup.py sdist
@@ -72,4 +73,4 @@ commands =
7273
deps =
7374
twine
7475
wheel
75-
readme_renderer[md]
76+
readme_renderer[rst]

0 commit comments

Comments
 (0)