Skip to content

Update pytest #6233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 2, 2019
Merged

Update pytest #6233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3e0b05
Update pytest
stsewd Oct 2, 2019
47a7533
Remove pyup constrains
stsewd Oct 2, 2019
d4eeb1a
Linter
stsewd Oct 2, 2019
c8592fb
Merge branch 'master' into stsewd/update-pytest
stsewd Oct 2, 2019
c77ded9
Update submodule
stsewd Oct 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 3 files
+1 −1 isort.cfg
+1 −1 prospector-more.yml
+1 −0 prospector.yml
3 changes: 1 addition & 2 deletions conftest.py → readthedocs/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import pytest
from django.conf import settings
from rest_framework.test import APIClient


try:
# TODO: this file is read/executed even when called from ``readthedocsinc``,
# so it's overriding the options that we are defining in the ``conftest.py``
Expand Down
11 changes: 3 additions & 8 deletions requirements/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@
-r local-docs-build.txt

django-dynamic-fixture==2.0.0
# pytest 4.2 is incompatible with pytest-django 3.4.6
pytest==4.1.1 # pyup: <4.2
# pytest-django 3.4.7 break our tests from corporate site
# probably a bug related to overriding django settings in
# previous tests
pytest-django==3.4.6 # pyup: <3.4.7
# pytest-xdist >1.27 requires pytest >4.1
pytest-xdist==1.27.0 # pyup: ignore
pytest==5.2.0
pytest-django==3.5.1
pytest-xdist==1.30.0
pytest-cov==2.7.1
apipkg==1.5
execnet==1.7.1
Expand Down