diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-05-08 14:19:02 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-05-08 14:19:02 -0700 |
| commit | 7bd8e93a0e16729c7d348cf5d4b90e62083991d4 (patch) | |
| tree | 3139598251b089598ec420a289427074eddfd529 | |
| parent | 6db806c7842e2b6dc75da14712dfa19e1b6354ce (diff) | |
| parent | fed0924df3a063d816f9d939018543aa1e5e1df7 (diff) | |
| download | paramiko-7bd8e93a0e16729c7d348cf5d4b90e62083991d4.tar.gz | |
Merge branch '1.15' into 1.16
| -rw-r--r-- | dev-requirements.txt | 12 | ||||
| -rw-r--r-- | setup.py | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt index feae948a..0c1fc020 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,11 +1,11 @@ # Older junk tox>=1.4,<1.5 # For newer tasks like building Sphinx docs. -invoke>=0.11.1 -invocations>=0.11.0 -sphinx>=1.1.3 -alabaster>=0.7.5 -releases>=1.1.0 -semantic_version<3 +invoke>=0.11.1,<2.0 +invocations>=0.11.0,<2.0 +sphinx>=1.1.3,<2.0 +alabaster>=0.7.5,<2.0 +releases>=1.1.0,<2.0 +semantic_version<3.0 wheel==0.24 twine==1.5 @@ -77,7 +77,7 @@ setup( 'Programming Language :: Python :: 3.5', ], install_requires=[ - 'pycrypto>=2.1,!=2.4', - 'ecdsa>=0.11', + 'pycrypto>=2.1,!=2.4,<3.0', + 'ecdsa>=0.11,<2.0', ], ) |