Merge branch '2.2' into pyup-update-pytest-3.1.0-to-3.4.1

This commit is contained in:
ziajka
2018-02-21 10:05:27 +01:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -2,5 +2,5 @@
pep8==1.7.0
pytest==3.4.1
pytest-pythonpath==0.7.1 # useful for running tests outside tox
pytest-pythonpath==0.7.2 # useful for running tests outside tox
pytest-timeout==1.2.0

View File

@@ -1,4 +1,4 @@
-rrequirements.txt
PyQt5==5.8 # pyup: ignore
PyQt5==5.10 # pyup: ignore
pypiwin32 # pyup: ignore