summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2018-12-14 21:46:21 -0800
committerJeff Forcier <jeff@bitprophet.org>2018-12-14 21:46:21 -0800
commitbcdf37ea9ce8a8e07aa17a4f690630fc48d3690d (patch)
tree177c3610183a64c93683fc531727b31f61cb9ae7
parentc2ef83060b26ed4eed5cca762d288a7322de49d2 (diff)
parent2b42accd3164a3ebac1c902fc394dfe1eb5dd05f (diff)
downloadparamiko-bcdf37ea9ce8a8e07aa17a4f690630fc48d3690d.tar.gz
Merge branch '2.0' into 2.1
-rw-r--r--dev-requirements.txt7
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