Skip to content

Commit f3e0b05

Browse files
committed
Update pytest
This also moves the conftest.py file to a module, this is the recommend way https://docs.pytest.org/en/latest/pythonpath.html#pythonpath And fix some problems with tests on the corporate site.
1 parent 0b2e1d5 commit f3e0b05

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

conftest.py renamed to readthedocs/conftest.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
import pytest
32
from django.conf import settings
43
from rest_framework.test import APIClient

requirements/testing.txt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@
22
-r local-docs-build.txt
33

44
django-dynamic-fixture==2.0.0
5-
# pytest 4.2 is incompatible with pytest-django 3.4.6
6-
pytest==4.1.1 # pyup: <4.2
7-
# pytest-django 3.4.7 break our tests from corporate site
8-
# probably a bug related to overriding django settings in
9-
# previous tests
10-
pytest-django==3.4.6 # pyup: <3.4.7
11-
# pytest-xdist >1.27 requires pytest >4.1
12-
pytest-xdist==1.27.0 # pyup: ignore
5+
pytest==5.2.0 # pyup: <4.2
6+
pytest-django==3.5.1 # pyup: <3.4.7
7+
pytest-xdist==1.30.0 # pyup: ignore
138
pytest-cov==2.7.1
149
apipkg==1.5
1510
execnet==1.7.1

0 commit comments

Comments
 (0)