diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2018-12-14 21:46:27 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2018-12-14 21:46:27 -0800 |
commit | 68ca9cc36b1d15fe60c263894bc91f4a1db648bc (patch) | |
tree | 807b7393bff8799237814b40fc6008d4fb36db12 | |
parent | 80b46a9f7c7b8da13980350a224ac32d9cabd2b1 (diff) | |
parent | 2f32a9cc07c77fb035f16671a7463febb405b013 (diff) |
Merge branch '2.2' into 2.3
-rw-r--r-- | dev-requirements.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt index eea5f21f..3af84aa9 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -4,11 +4,9 @@ invocations>=1.2.0,<2.0 # NOTE: pytest-relaxed currently only works with pytest >=3, <3.3 pytest>=3.2,<3.3 pytest-relaxed==1.1.4 -# pytest-xdist for test dir watching and the inv guard task -pytest-xdist>=1.22,<1.25.0 mock==2.0.0 # Linting! -flake8==3.6.0 +flake8==2.4.0 # Coverage! coverage==3.7.1 codecov==1.6.3 @@ -21,4 +19,5 @@ semantic_version>=2.4,<2.5 wheel==0.24 twine==1.11.0 # Test-matrix-oriented pins of production deps; should only exist on 2.0-2.3 -pycparser==2.18 +pycparser<2.19 +idna<2.8 |