Skip to content

Commit

Permalink
Merge pull request #379 from Yelp/fix-build-restrict-pytest
Browse files Browse the repository at this point in the history
Restrict pytest to <4.7 to fix build, add py36 and mypy to tox envlist
  • Loading branch information
sjaensch committed Sep 30, 2020
2 parents e64856c + f56c110 commit a783275
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion requirements-dev.txt
Expand Up @@ -3,6 +3,6 @@ mock
mypy-extensions; python_version>='3.5'
mypy; python_version>='3.5'
pre-commit
pytest
pytest-benchmark[histogram]
pytest-cov
pytest<4.7 # need support for Python 2.7, see https://docs.pytest.org/en/latest/py27-py34-deprecation.html
4 changes: 2 additions & 2 deletions tox.ini
Expand Up @@ -3,7 +3,7 @@ filterwarnings =
ignore:.*will be deprecated in the next major release. Please use the more general entry-point offered in.*:DeprecationWarning

[tox]
envlist = py27, py37, pre-commit
envlist = py27, py36, py37, mypy, pre-commit

[testenv]
deps =
Expand Down Expand Up @@ -40,7 +40,7 @@ exclude = .svn,CVS,.bzr,.hg,.git,__pycache__,.tox,docs,virtualenv_run
max_line_length = 130

[testenv:pre-commit]
basepython = /usr/bin/python2.7
basepython = python2.7
deps =
pre-commit>0.12.0
setenv =
Expand Down

0 comments on commit a783275

Please sign in to comment.