Skip to content

Commit

Permalink
Unpin django-pytest now that pytest has upgraded to 5.4.0 and later (#…
Browse files Browse the repository at this point in the history
…24730)

- Originally pinned in PR #23566
- pytest was unpinned in PR #24717 and upgraded to v6+
  • Loading branch information
timmc-edx committed Aug 7, 2020
1 parent ccefeba commit b04f784
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
4 changes: 0 additions & 4 deletions requirements/constraints.txt
Expand Up @@ -91,10 +91,6 @@ path<13.2.0
# ARCHBOM-1141: pip-tools upgrade requires pip upgrade
pip-tools<5.0.0

# pytest-django 3.9.0 has a fix for pytest 5.4.0+ that breaks cleanup after failed tests in earlier pytest versions
# https://github.com/pytest-dev/pytest-django/issues/824
pytest-django<3.9.0

# Upgrading to 2.5.3 on 2020-01-03 triggered "'tzlocal' object has no attribute '_std_offset'" errors in production
python-dateutil==2.4.0

Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/development.txt
Expand Up @@ -234,7 +234,7 @@ pyrsistent==0.16.0 # via jsonschema
pysrt==1.1.2 # via -r requirements/edx/testing.txt, edxval
pytest-attrib==0.1.3 # via -r requirements/edx/testing.txt
pytest-cov==2.10.0 # via -r requirements/edx/testing.txt
pytest-django==3.8.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
pytest-django==3.9.0 # via -r requirements/edx/testing.txt
pytest-forked==1.3.0 # via -r requirements/edx/testing.txt, pytest-xdist
pytest-json-report==1.2.1 # via -r requirements/edx/testing.txt
pytest-metadata==1.8.0 # via -r requirements/edx/testing.txt, pytest-json-report
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/testing.txt
Expand Up @@ -224,7 +224,7 @@ pyquery==1.4.1 # via -r requirements/edx/testing.in
pysrt==1.1.2 # via -r requirements/edx/base.txt, edxval
pytest-attrib==0.1.3 # via -r requirements/edx/testing.in
pytest-cov==2.10.0 # via -r requirements/edx/testing.in
pytest-django==3.8.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.in
pytest-django==3.9.0 # via -r requirements/edx/testing.in
pytest-forked==1.3.0 # via pytest-xdist
pytest-json-report==1.2.1 # via -r requirements/edx/testing.in
pytest-metadata==1.8.0 # via -r requirements/edx/testing.in, pytest-json-report
Expand Down

0 comments on commit b04f784

Please sign in to comment.