Skip to content

Commit aecb9f9

Browse files
author
Dan
committed
Downgraded paramiko due to API brokeness. Removed environment markers from requirements for better compatibility with old pip versions - moved version check to setup.py
1 parent 2f08520 commit aecb9f9

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

requirements.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
paramiko>=1.15.3
2-
gevent<=1.1; python_version < '2.7'
3-
gevent>=1.1; python_version >= '2.7'
1+
paramiko>=1.15.3,<2
2+
gevent

setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@
1414
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
from setuptools import setup, find_packages
17+
from platform import python_version
1718

1819
import versioneer
1920

21+
gevent_req = 'gevent<=1.1' if python_version() < '2.7' else 'gevent>=1.1'
22+
2023
setup(name='parallel-ssh',
2124
version=versioneer.get_version(),
2225
cmdclass=versioneer.get_cmdclass(),
@@ -27,7 +30,7 @@
2730
url="https://github.com/ParallelSSH/parallel-ssh",
2831
packages=find_packages('.', exclude=(
2932
'embedded_server', 'embedded_server.*')),
30-
install_requires=['paramiko', 'gevent'],
33+
install_requires=['paramiko<2', gevent_req],
3134
classifiers=[
3235
'License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)',
3336
'Intended Audience :: Developers',

0 commit comments

Comments
 (0)