From 38f0e6859aeb97371769d1633fce114321dc7206 Mon Sep 17 00:00:00 2001 From: Bruno FS Date: Wed, 10 Oct 2018 22:38:25 -0300 Subject: [PATCH] Increase support matrix --- .gitignore | 3 +++ .travis.yml | 14 +++++++++----- README.rst | 2 +- django_slowtests/tests/urls.py | 13 +++++-------- runtests.py | 2 +- tox.ini | 7 +++++-- 6 files changed, 24 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 159818e..bc1d2c7 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,6 @@ target/ .sqlite3 update.txt .pypirc +.idea/ +.python-version +.venv/ \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 067f536..179a680 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,16 @@ python: - "3.4" - "3.5" - "3.6" + - "3.7" env: matrix: - - DJANGO=Django==1.10.6 - - DJANGO=Django==1.9.12 - - DJANGO=Django==1.8.17 + - DJANGO=Django==2.1.2 + - DJANGO=Django==2.0.9 + - DJANGO=Django==1.11.16 + - DJANGO=Django==1.10.8 + - DJANGO=Django==1.9.13 + - DJANGO=Django==1.8.19 - DJANGO=Django==1.7.11 - DJANGO=Django==1.6.11 @@ -30,9 +34,9 @@ matrix: - python: "3.5" env: DJANGO=Django==1.6.11 - python: "3.3" - env: DJANGO=Django==1.10.6 + env: DJANGO=Django==1.10.8 - python: "3.3" - env: DJANGO=Django==1.9.12 + env: DJANGO=Django==1.9.13 script: - flake8 --max-line-length=100 --max-complexity=10 --statistics --benchmark django_slowtests diff --git a/README.rst b/README.rst index 559ee1f..79f50c1 100644 --- a/README.rst +++ b/README.rst @@ -18,7 +18,7 @@ Welcome! Welcome to the documentation for django-slowtests! -*Code tested on Django 1.6, 1.7, 1.8, 1.9, and 1.10 with Python 2.7 and 3.6.* +*Code tested on Django 1.6, 1.7, 1.8, 1.9, 1.11, 2.0 and 2.1 with Python 2.7 and 3.6.* Instructions diff --git a/django_slowtests/tests/urls.py b/django_slowtests/tests/urls.py index 65e57f3..453338c 100644 --- a/django_slowtests/tests/urls.py +++ b/django_slowtests/tests/urls.py @@ -1,9 +1,6 @@ -try: - from django.conf.urls import patterns -except ImportError: - from django.conf.urls.defaults import patterns +from django.conf.urls import url +from django.views.generic import TemplateView - -urlpatterns = patterns( - "", -) +urlpatterns = [ + url('', TemplateView.as_view()), +] diff --git a/runtests.py b/runtests.py index a0aacbe..bb69191 100644 --- a/runtests.py +++ b/runtests.py @@ -23,7 +23,7 @@ }, SITE_ID=1, ROOT_URLCONF="django_slowtests.tests.urls", - SECRET_KEY="notasecret", + SECRET_KEY="not-a-secret", ) diff --git a/tox.ini b/tox.ini index e3924f3..520e33c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{27}-dj1.{6,7,8,9,10}, py{36}-dj1.{8,9,10} +envlist = py{27}-dj{1.6,1.7,1.8,1.9,1.10,1.11}, py{36}-dj{1.8,1.9,1.10,1.11, 2.0, 2.1} [testenv] deps = @@ -9,5 +9,8 @@ deps = dj1.8: Django>=1.8,<1.9 dj1.9: Django>=1.9,<1.10 dj1.10: Django>=1.10,<1.11 + dj1.11: Django>=1.11,<2 + dj2.0: Django>=2<2.1 freezegun>=0.1.8 -commands = coverage run setup.py test +commands = + coverage run setup.py test