Skip to content

Commit

Permalink
chore: Post Django32 Cleanup
Browse files Browse the repository at this point in the history
fix: fix Django dependency
  • Loading branch information
edx-requirements-bot authored and aht007 committed Jan 18, 2022
1 parent 3be85a4 commit f381e14
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [django22, django30, django31, django32, quality]
toxenv: [quality, django32, django40]
steps:
- uses: actions/checkout@v1
- name: setup python
Expand All @@ -36,7 +36,7 @@ jobs:
run: make test

- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='django22'
if: matrix.python-version == '3.8' && matrix.toxenv=='django32'
uses: codecov/codecov-action@v1
with:
flags: unittests
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ idna==3.3
# -r requirements/ci.txt
# -r requirements/test.txt
# requests
importlib-metadata==4.10.0
importlib-metadata==4.10.1
# via
# -r requirements/test.txt
# keyring
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ idna==3.3
# via
# -r requirements/base.txt
# requests
importlib-metadata==4.10.0
importlib-metadata==4.10.1
# via
# keyring
# twine
Expand Down
18 changes: 8 additions & 10 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38-django{22,30,31,32}, quality
envlist = py38-django{32,40}, quality

[pytest]
DJANGO_SETTINGS_MODULE = test_settings
Expand All @@ -8,17 +8,15 @@ norecursedirs = .* docs requirements

[testenv]
deps =
django22: Django>=2.2,<2.3
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
django32: Django>=3.2,<3.3
-r{toxinidir}/requirements/test.txt
django32: Django>=3.2,<4.0
django40: Django>=4.0,<4.1
-r{toxinidir}/requirements/test.txt
commands =
pytest {posargs}
pytest {posargs}

[testenv:quality]
commands =
pycodestyle --config=.pep8 edx_rest_api_client
pylint --rcfile=pylintrc edx_rest_api_client
twine check {distdir}/*
pycodestyle --config=.pep8 edx_rest_api_client
pylint --rcfile=pylintrc edx_rest_api_client
twine check {distdir}/*

0 comments on commit f381e14

Please sign in to comment.