Skip to content

Commit

Permalink
Test with Django 3.1 and Python 3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
erdnaxe committed Jan 18, 2021
1 parent a023037 commit 4d1d2e6
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 41 deletions.
19 changes: 17 additions & 2 deletions .gitlab-ci.yml
Expand Up @@ -22,10 +22,25 @@ py37-django22:
stage: test
script: tox -e py37-django22

py37-django30:
py37-django31:
image: python:3.7
stage: test
script: tox -e py37-django30
script: tox -e py37-django31

py38-django22:
image: python:3.8
stage: test
script: tox -e py38-django22

py38-django31:
image: python:3.8
stage: test
script: tox -e py38-django31

py39-django31:
image: python:3.9
stage: test
script: tox -e py39-django31

linters:
image: python:3.6
Expand Down
9 changes: 6 additions & 3 deletions .travis.yml
Expand Up @@ -5,11 +5,14 @@ jobs:
include:
# Django 1.11: Python 3.6
- { env: TOXENV=py36-django111, python: 3.6 }
# Django 2.2: Python 3.6, or 3.7
# Django 2.2: Python 3.6, 3.7 or 3.8
- { env: TOXENV=py36-django22, python: 3.6 }
- { env: TOXENV=py37-django22, python: 3.7 }
# Django 3.0: Python 3.7
- { env: TOXENV=py37-django30, python: 3.7 }
- { env: TOXENV=py38-django22, python: 3.8 }
# Django 3.1: Python 3.7, 3.8 or 3.9
- { env: TOXENV=py37-django31, python: 3.7 }
- { env: TOXENV=py37-django31, python: 3.8 }
- { env: TOXENV=py37-django31, python: 3.9 }
# Lint: Python 3.6
- { env: TOXENV=linters, python: 3.6 }
# Test docs
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Expand Up @@ -26,8 +26,8 @@ Features
* Integration with Django Rest Framework ;
* Generation of ready to use zone files.

This app targets Django 1.11 (current Debian version), 2.2 (last LTS) and 3.0.
It runs on Python 3.6 and Python 3.7.
This app targets Django 1.11 (current Debian version), 2.2 (last LTS) and 3.1.
It runs on Python 3.6 to 3.9.

Running a demo project
----------------------
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Expand Up @@ -26,7 +26,7 @@ classifiers =
packages = find:
include_package_data = True
install_requires =
Django >= 1.11, < 2.3
Django >= 1.11
django-polymorphic ~= 2.0

[options.packages.find]
Expand Down
68 changes: 35 additions & 33 deletions tox.ini
@@ -1,67 +1,69 @@
[tox]
envlist =
py36-django{111,22}
py37-django{22,30}
py37-django{22,31}
py38-django{22,31}
py39-django31
linters
docs
docs

[testenv]
setenv =
PYTHONWARNINGS = all
deps =
coverage
djangorestframework == 3.9.1
django111: Django >= 1.11, < 2.0
djangorestframework == 3.9.1
django111: Django ~= 1.11
django22: Django ~= 2.2
django30: Django ~= 3.0
django31: Django ~= 3.1
django-polymorphic == 2.0.3
.
commands =
coverage run --source dnsmanager runtests.py

[testenv:linters]
deps =
Django ~= 2.2
django-polymorphic == 2.0.3
flake8
flake8-colors
flake8-import-order
flake8-typing-imports
pep8-naming
pyflakes
Django ~= 2.2
django-polymorphic == 2.0.3
flake8
flake8-colors
flake8-import-order
flake8-typing-imports
pep8-naming
pyflakes
commands =
flake8 dnsmanager
flake8 dnsmanager

[testenv:docs]
deps =
Pygments==2.3.1
setuptools==41.0.1
docutils==0.14
mock==1.0.1
pillow==5.4.1
Pygments==2.3.1
setuptools==41.0.1
docutils==0.14
mock==1.0.1
pillow==5.4.1
sphinx<2
sphinx-rtd-theme<0.5
sphinx-rtd-theme<0.5
-r{toxinidir}/docs/requirements.txt
changedir = docs
whitelist_externals =
mkdir
mkdir
commands =
mkdir -p _static
sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
mkdir -p _static
sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html

[flake8]
ignore = D203, W503, E203
exclude =
.tox,
.git,
__pycache__,
build,
dist,
*.pyc,
*.egg-info,
.cache,
.eggs,
*migrations*
.tox,
.git,
__pycache__,
build,
dist,
*.pyc,
*.egg-info,
.cache,
.eggs,
*migrations*
max-complexity = 10
max-line-length = 300
import-order-style = google
Expand Down

0 comments on commit 4d1d2e6

Please sign in to comment.