Skip to content

Commit 3467dfe

Browse files
committed
Use the appropriate version of Paramiko for Python 2.6 environments
Paramiko dropped support for Python 2.6 in v2.4.0. Pinning the version to v.2.3.1 for Python 2.6 environments. Signed-off-by: Raghu Raja <[email protected]>
1 parent 33b11c1 commit 3467dfe

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ python:
88
- "3.6"
99

1010
install:
11-
- pip install -r requirements.txt
11+
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install -r requirements26.txt; fi
12+
- if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then pip install -r requirements.txt; fi
1213
- pip install -e .
1314

1415
sudo: false

requirements26.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
paramiko==2.3.1

setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,15 @@ def read(fname):
2222
console_scripts = ['sqswatcher = sqswatcher.sqswatcher:main',
2323
'nodewatcher = nodewatcher.nodewatcher:main']
2424
version = "1.4.2"
25-
requires = ['boto>=2.48.0', 'paramiko>=2.3.1', 'python-dateutil>=2.6.1']
25+
requires = ['boto>=2.48.0', 'python-dateutil>=2.6.1']
2626

2727
if sys.version_info[:2] == (2, 6):
2828
# For python2.6 we have to require argparse since it
2929
# was not in stdlib until 2.7.
3030
requires.append('argparse>=1.4')
31+
requires.append('paramiko==2.3.1')
32+
else:
33+
requires.append('paramiko>=2.3.1')
3134

3235
setup(
3336
name = "cfncluster-node",

0 commit comments

Comments
 (0)