Merge pull request #32 from lorengordon/py26-compat

Restricts pip<10 to preserve py2.6 compatibility
plus3it · Apr 18, 2018 · 5bba5a2 · 5bba5a2
2 parents 8c57b38 + 69e1264
commit 5bba5a2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.1
+current_version = 1.3.2
 commit = True
 message = Bumps version to {new_version}
 tag = False

diff --git a/modules/lx-autoscale/watchmaker-lx-autoscale.cfn.json b/modules/lx-autoscale/watchmaker-lx-autoscale.cfn.json
@@ -1187,7 +1187,7 @@
                                             "\n",
                                             "pip install",
                                             " --index-url=\"$PYPI_URL\"",
-                                            " --upgrade pip 'setuptools<37;python_version<\"2.7\"' 'setuptools;python_version>=\"2.7\"' boto3\n",
+                                            " --upgrade 'pip<10' 'setuptools<37;python_version<\"2.7\"' 'setuptools;python_version>=\"2.7\"' boto3\n",
                                             "pip install",
                                             " --index-url=\"$PYPI_URL\"",
                                             " --upgrade watchmaker\n\n"
@@ -1608,7 +1608,7 @@
                                 "# Upgrade pip and setuptools\n",
                                 "pip install",
                                 " --index-url=\"$PYPI_URL\"",
-                                " --upgrade pip 'setuptools<37;python_version<\"2.7\"' 'setuptools;python_version>=\"2.7\"'",
+                                " --upgrade 'pip<10' 'setuptools<37;python_version<\"2.7\"' 'setuptools;python_version>=\"2.7\"'",
                                 "\n\n",
                                 "# Fix python urllib3 warnings\n",
                                 "yum -y install gcc python-devel libffi-devel openssl-devel\n",

diff --git a/modules/lx-instance/watchmaker-lx-instance.cfn.json b/modules/lx-instance/watchmaker-lx-instance.cfn.json
@@ -1052,7 +1052,7 @@
                                             "\n",
                                             "pip install",
                                             " --index-url=\"$PYPI_URL\"",
-                                            " --upgrade pip 'setuptools<37;python_version<\"2.7\"' 'setuptools;python_version>=\"2.7\"' boto3\n",
+                                            " --upgrade 'pip<10' 'setuptools<37;python_version<\"2.7\"' 'setuptools;python_version>=\"2.7\"' boto3\n",
                                             "pip install",
                                             " --index-url=\"$PYPI_URL\"",
                                             " --upgrade watchmaker\n\n"
@@ -1538,7 +1538,7 @@
                                 "# Upgrade pip and setuptools\n",
                                 "pip install",
                                 " --index-url=\"$PYPI_URL\"",
-                                " --upgrade pip 'setuptools<37;python_version<\"2.7\"' 'setuptools;python_version>=\"2.7\"'",
+                                " --upgrade 'pip<10' 'setuptools<37;python_version<\"2.7\"' 'setuptools;python_version>=\"2.7\"'",
                                 "\n\n",
                                 "# Fix python urllib3 warnings\n",
                                 "yum -y install gcc python-devel libffi-devel openssl-devel\n",