Skip to content

Commit 969fcd6

Browse files
committed
[ci] CI maintenance
- Updated Python versions - Always update pip to the latest available version - Avoid stopping build if QA checs fail - Updated tox conf
1 parent 5d45996 commit 969fcd6

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: [3.7, 3.8, 3.9]
18+
python-version:
19+
- "3.8"
20+
- "3.9"
21+
- "3.10"
1922

2023
steps:
2124
- uses: actions/checkout@v2
@@ -28,13 +31,15 @@ jobs:
2831
python-version: ${{ matrix.python-version }}
2932

3033
- name: Install dependencies
34+
id: deps
3135
run: |
32-
pip install -U "pip==20.2.4" wheel setuptools
36+
pip install -U pip wheel setuptools
3337
pip install tox tox-gh-actions
3438
pip install openwisp-utils[qa]@https://github.com/openwisp/openwisp-utils/tarball/master
3539
3640
- name: QA checks
3741
run: ./run-qa-checks
3842

3943
- name: Test
44+
if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
4045
run: tox

tox.ini

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ deps =
2626
setenv =
2727
noswap: DJANGO_SETTINGS_MODULE=tests.settings
2828
swap: DJANGO_SETTINGS_MODULE=tests.swap_settings
29-
whitelist_externals = rm
29+
allowlist_externals = rm
3030

3131
[testenv:lint]
3232
commands =
3333
rm -rf tests/default_app/migrations/ tests/alt_app/migrations/
3434
flake8 swapper tests
35+
allowlist_externals =
36+
rm
37+
flake8

0 commit comments

Comments
 (0)