1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00

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

Update pytest to 3.4.1
This commit is contained in:
ziajka 2018-02-21 11:59:38 +01:00 committed by GitHub
commit 89b352890c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
*.py[cod] *.py[cod]
__pycache__ __pycache__
.pytest_cache
#py.test #py.test
.cache .cache

View File

@ -1,7 +1,6 @@
-rrequirements.txt -rrequirements.txt
sphinx==1.6.6 sphinx==1.6.6
pytest==3.3.2 pytest==3.4.1
pep8==1.7.1 pep8==1.7.1
pytest-catchlog==1.2.2
pytest-timeout==1.2.1 pytest-timeout==1.2.1

3
pytest.ini Normal file
View File

@ -0,0 +1,3 @@
[pytest]
log_level=NOTSET
ignore=env