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]>
aws · Dec 21, 2017 · 3467dfe · 3467dfe
1 parent 33b11c1
commit 3467dfe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,8 @@ python:
   - "3.6"
 
 install:
-  - pip install -r requirements.txt
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install -r requirements26.txt; fi
+  - if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then pip install -r requirements.txt; fi
   - pip install -e .
 
 sudo: false

diff --git a/requirements26.txt b/requirements26.txt
@@ -0,0 +1 @@
+paramiko==2.3.1
diff --git a/setup.py b/setup.py
@@ -22,12 +22,15 @@ def read(fname):
 console_scripts = ['sqswatcher = sqswatcher.sqswatcher:main', 
                    'nodewatcher = nodewatcher.nodewatcher:main']
 version = "1.4.2"
-requires = ['boto>=2.48.0', 'paramiko>=2.3.1', 'python-dateutil>=2.6.1']
+requires = ['boto>=2.48.0', 'python-dateutil>=2.6.1']
 
 if sys.version_info[:2] == (2, 6):
     # For python2.6 we have to require argparse since it
     # was not in stdlib until 2.7.
     requires.append('argparse>=1.4')
+    requires.append('paramiko==2.3.1')
+else:
+    requires.append('paramiko>=2.3.1')
 
 setup(
     name = "cfncluster-node",