updated tests to use newest django

wolph · Nov 9, 2020 · 1a8aa8e · 1a8aa8e
1 parent c5b90da
commit 1a8aa8e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -17,6 +17,7 @@ source =
 
 branch = True
 omit =
+    */__about__.py
     */test_project/*
     */metadata.py
 

diff --git a/pytest.ini b/pytest.ini
@@ -2,20 +2,20 @@
 python_files =
     django_admin_generator/*.py
     test_project/*.py
+    tests.py
+    test_*.py
+    *_tests.py
 
 addopts =
     --cov django_admin_generator
     --cov-report term-missing
     --cov-report html
-    --pep8
-    --flakes
+    --flake8
 
-pep8ignore =
-    *.py W391
-    docs/*.py ALL
-
-flakes-ignore =
+flake8-ignore =
+    *.py W391 W504
     docs/*.py ALL
+    test_project/*.py
 
 DJANGO_SETTINGS_MODULE=test_project.settings
 
diff --git a/setup.py b/setup.py
@@ -51,12 +51,11 @@ def run_tests(self):
                 'sphinx>=1.6.0',
             ],
             'tests': [
-                'pytest',
+                'pytest<6',
                 'pytest-cache',
                 'pytest-cov',
                 'pytest-django',
-                'pytest-flakes',
-                'pytest-pep8',
+                'pytest-flake8',
             ],
         },
         long_description=long_description,

diff --git a/tox.ini b/tox.ini
@@ -1,10 +1,11 @@
 [tox]
 envlist = 
     py{py,27}-django11,
-    py35-django{11,21,22},
-    py36-django{11,21,22},
-    py37-django{11,21,22},
-    py38-django{11,21,22},
+    py35-django{11,22},
+    py36-django{11,22},
+    py37-django{11,22,30},
+    py38-django{11,22,30},
+    py39-django{11,22,30},
     flake8,
     docs
 
@@ -14,16 +15,17 @@ usedevelop = True
 [testenv]
 deps =
     django11: Django<2.0
-    django21: Django>=2.1,<2.2
     django22: Django>=2.2,<2.3
+    django30: Django>=3.0,<3.1
     -r{toxinidir}/test_project/requirements.txt
 
 envlist = 
     py{py,27}-django11,
-    py35-django{11,21,22},
-    py36-django{11,21,22},
-    py37-django{11,21,22},
-    py38-django{11,21,22}
+    py35-django{11,22,30},
+    py36-django{11,22,30},
+    py37-django{11,22,30},
+    py38-django{11,22,30},
+    py39-django{11,22,30},
 
 commands =
     python setup.py test
@@ -55,7 +57,7 @@ commands =
     coveralls
 
 deps =
-    Django>=2.2,<2.3
+    Django>=3.0,<3.1
     -r{toxinidir}/test_project/requirements.txt
     coveralls