Merge ccbaa15 into 8624cbd

abhiabhi94 · Mar 11, 2021 · 762f08d · 762f08d
2 parents 8624cbd + ccbaa15
commit 762f08d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -38,7 +38,7 @@ To run tests against a particular ``python`` and ``django`` version installed in
 
 .. code:: sh
 
-    (venv) $ python manage.py test
+    (venv) $ pytest
 
 To run tests against all supported ``python`` and ``django`` versions, you may run:
 

diff --git a/setup.cfg b/setup.cfg
@@ -7,3 +7,7 @@ extend-ignore =
 
 [isort]
 known_third_party = django, rest_framework
+[tool:pytest]
+DJANGO_SETTINGS_MODULE = testapp.settings
+# Standard pytest options
+addopts = -p no:warnings --reuse-db
diff --git a/testapp/requirements.txt b/testapp/requirements.txt
@@ -1,6 +1,7 @@
 django
 djangorestframework
-coverage
 flake8
 tox
 Pillow
+pytest-django
+pytest-cov
diff --git a/tox.ini b/tox.ini
@@ -19,10 +19,11 @@ DJANGO =
 
 [testenv]
 deps =
-    coverage
     flake8
     Pillow
     djangorestframework
+    pytest-django
+    pytest-cov
     dj21: Django>=2.1,<2.2
     dj22: Django>=2.2,<2.3
     dj30: Django>=3.0,<3.1
@@ -35,8 +36,7 @@ commands =
     python -m pip install --upgrade pip
     flake8
     python manage.py migrate
-    coverage run manage.py test
-    coverage report -m --skip-covered
+    pytest --cov
 
 setenv =
     PYTHONDONTWRITEBYTECODE=1