Skip to content

Commit acbd0af

Browse files
authored
Fix CI pipeline (#269)
1 parent 81e5851 commit acbd0af

File tree

2 files changed

+20
-27
lines changed

2 files changed

+20
-27
lines changed

.github/workflows/tests.yml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
11
name: Run tests with tox
22

3-
on: [push, pull_request]
3+
on: [push]
44

55

66
jobs:
77
test:
88
runs-on: ubuntu-latest
9-
deploy:
10-
runs-on: ubuntu-20.04
119
strategy:
1210
matrix:
13-
include:
14-
python-version:
15-
- '3.6'
16-
- '3.7'
17-
- '3.8'
18-
- '3.9'
11+
python-version:
12+
- '3.6'
13+
- '3.7'
14+
- '3.8'
15+
- '3.9'
1916
concurrency:
2017
group: ${{ github.workflow }}-${{ github.ref }}
2118
steps:
19+
2220
- uses: actions/checkout@v3
2321

2422
- uses: actions/setup-python@v3
2523
with:
2624
python-version: ${{ matrix.python-version }}
27-
cache: 'pip'
28-
cache-dependency-path: '**/requirements*.txt'
25+
26+
- uses: actions/cache@v3
27+
with:
28+
path: |
29+
~/.cache/pip
30+
.tox
31+
key: ${{ env.pythonLocation }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements-test.txt') }}
2932

3033
- name: Upgrade packaging tools
3134
run: python -m pip install --upgrade pip setuptools virtualenv wheel
3235

3336
- name: Install dependencies
34-
run: python -m pip install --upgrade codecov tox tox-py
37+
run: python -m pip install --upgrade tox tox-py
3538

3639
- name: Run tox targets for ${{ matrix.python-version }}
37-
run: tox --py current
38-
39-
- name: Upload coverage
40-
run: |
41-
codecov -e TOXENV,DJANGO
40+
run: tox --py current

tox.ini

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,21 @@ envlist =
88
{py36,py37,py38,py39}-django-22
99
{py36,py37,py38,py39}-django-30
1010
{py36,py37,py38,py39}-django-31
11-
{py36,py37,py38,py39}-django-master
11+
; {py36,py37,py38,py39}-django-32
12+
; {py36,py37,py38,py39}-django-master
1213

1314

14-
15-
[travis:env]
16-
DJANGO =
17-
2.2: django-22
18-
3.0: django-30
19-
3.1: django-31
20-
master: django-master
21-
2215
[testenv]
2316

2417
setenv =
2518
PYTHONPATH = {toxinidir}
26-
commands = pytest --coverage {posargs}
19+
commands = pytest --cov=dynamic_preferences {posargs}
2720
deps =
2821
django-{22,30,31,master}: djangorestframework>=3.12,<3.13
2922
django-22: Django>=2.2,<2.3
3023
django-30: Django>=3.0,<3.1
3124
django-31: Django>=3.1,<3.2
25+
django-32: Django>=3.2,<3.3
3226
django-master: https://github.com/django/django/archive/master.tar.gz
3327
-r{toxinidir}/requirements-test.txt
3428

0 commit comments

Comments
 (0)