Merge pull request #1303 from GNS3/pyup-update-pytest-3.3.2-to-3.4.1

Update pytest to 3.4.1
6 years ago · 89b352890c
parent c0ff37039d 56b901a831
commit 89b352890c
3 changed files with 5 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,6 @@
 *.py[cod]
 __pycache__
+.pytest_cache

 #py.test
 .cache
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@ -1,7 +1,6 @@
 -rrequirements.txt

 sphinx==1.6.6
-pytest==3.3.2
+pytest==3.4.1
 pep8==1.7.1
-pytest-catchlog==1.2.2
 pytest-timeout==1.2.1
--- a/pytest.ini
+++ b/pytest.ini
@ -0,0 +1,3 @@
+[pytest]
+log_level=NOTSET
+ignore=env