Skip to content

Commit

Permalink
Upgrade pytest so we can use ALLOW_BYTES
Browse files Browse the repository at this point in the history
  • Loading branch information
adamnovak committed Jun 22, 2018
1 parent f2e54bb commit 0786809
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ check_build_reqs:


prepare: check_venv
$(pip) install sphinx==1.5.5 mock==1.0.1 pytest==2.8.3 stubserver==1.0.1 \
$(pip) install sphinx==1.5.5 mock==1.0.1 pytest==3.6.2 stubserver==1.0.1 \
pytest-timeout==1.2.0 cwltest


Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[pytest]
[tool:pytest]
# Look for any python file, the default of test_*.py wouldn't work for us
python_files=*.py
# Also run doctests
# Also run doctestsi
addopts = --doctest-modules --tb=native --assert=plain

0 comments on commit 0786809

Please sign in to comment.