From ccf77fb4861029deb1d07b7bab0642e375202347 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Fri, 13 Apr 2018 12:06:12 -0400 Subject: [PATCH 1/2] Includes more fixes for running on py2.6 --- .../watchmaker-lx-autoscale.cfn.json | 33 +++++++++++-------- .../watchmaker-lx-instance.cfn.json | 33 +++++++++++-------- 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/modules/lx-autoscale/watchmaker-lx-autoscale.cfn.json b/modules/lx-autoscale/watchmaker-lx-autoscale.cfn.json index eea7f65d..6f5cfc01 100644 --- a/modules/lx-autoscale/watchmaker-lx-autoscale.cfn.json +++ b/modules/lx-autoscale/watchmaker-lx-autoscale.cfn.json @@ -1179,7 +1179,12 @@ "Ref": "PypiIndexUrl" }, "\n", - "pip install --index-url=\"$PYPI_URL\" wheel==0.29.0\n", + "curl --silent --show-error --retry 5 -L ", + { + "Ref": "CfnGetPipUrl" + }, + " | python - --index-url=\"$PYPI_URL\" 'wheel<0.30.0;python_version<\"2.7\"' 'wheel;python_version>=\"2.7\"'", + "\n", "pip install", " --index-url=\"$PYPI_URL\"", " --upgrade pip 'setuptools<37;python_version<\"2.7\"' 'setuptools;python_version>=\"2.7\"' boto3\n", @@ -1585,39 +1590,41 @@ }, "\n\n", "# Get pip\n", - "curl --silent --show-error --retry 5 -L ", + "PYPI_URL=", { - "Ref": "CfnGetPipUrl" + "Ref": "PypiIndexUrl" }, - " | python - --index-url=", + "\n", + "curl --silent --show-error --retry 5 -L ", { - "Ref": "PypiIndexUrl" + "Ref": "CfnGetPipUrl" }, + " | python - --index-url=\"$PYPI_URL\" 'wheel<0.30.0;python_version<\"2.7\"' 'wheel;python_version>=\"2.7\"'", "\n\n", "# Add pip to path\n", "hash pip 2> /dev/null || ", "PATH=\"${PATH}:/usr/local/bin\"", "\n\n", "# Upgrade pip and setuptools\n", - "PYPI_URL=", - { - "Ref": "PypiIndexUrl" - }, - "\n", "pip install", " --index-url=\"$PYPI_URL\"", - " --upgrade pip 'setuptools<37;python_version<\"2.7\"' 'setuptools;python_version>=\"2.7\"'\n\n", + " --upgrade pip '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", "pip install", " --index-url=\"$PYPI_URL\"", - " --upgrade pyopenssl ndg-httpsclient pyasn1\n\n", + " --upgrade cffi\n", + "pip install", + " --index-url=\"$PYPI_URL\"", + " --upgrade pyopenssl ndg-httpsclient pyasn1 'cryptography<2.2;python_version<\"2.7\"' 'cryptography;python_version>=\"2.7\"'", + "\n\n", "if [[ $(rpm --quiet -q aws-cfn-bootstrap || pip show --quiet aws-cfn-bootstrap)$? -ne 0 ]]\n", "then\n", " # Get cfn utils\n", " pip install", " --index-url=\"$PYPI_URL\"", - " --upgrade ", + " --upgrade --upgrade-strategy only-if-needed ", { "Ref": "CfnBootstrapUtilsUrl" }, diff --git a/modules/lx-instance/watchmaker-lx-instance.cfn.json b/modules/lx-instance/watchmaker-lx-instance.cfn.json index 79532aa0..79b9ae20 100644 --- a/modules/lx-instance/watchmaker-lx-instance.cfn.json +++ b/modules/lx-instance/watchmaker-lx-instance.cfn.json @@ -1044,7 +1044,12 @@ "Ref": "PypiIndexUrl" }, "\n", - "pip install --index-url=\"$PYPI_URL\" wheel==0.29.0\n", + "curl --silent --show-error --retry 5 -L ", + { + "Ref": "CfnGetPipUrl" + }, + " | python - --index-url=\"$PYPI_URL\" 'wheel<0.30.0;python_version<\"2.7\"' 'wheel;python_version>=\"2.7\"'", + "\n", "pip install", " --index-url=\"$PYPI_URL\"", " --upgrade pip 'setuptools<37;python_version<\"2.7\"' 'setuptools;python_version>=\"2.7\"' boto3\n", @@ -1515,39 +1520,41 @@ }, "\n\n", "# Get pip\n", - "curl --silent --show-error --retry 5 -L ", + "PYPI_URL=", { - "Ref": "CfnGetPipUrl" + "Ref": "PypiIndexUrl" }, - " | python - --index-url=", + "\n", + "curl --silent --show-error --retry 5 -L ", { - "Ref": "PypiIndexUrl" + "Ref": "CfnGetPipUrl" }, + " | python - --index-url=\"$PYPI_URL\" 'wheel<0.30.0;python_version<\"2.7\"' 'wheel;python_version>=\"2.7\"'", "\n\n", "# Add pip to path\n", "hash pip 2> /dev/null || ", "PATH=\"${PATH}:/usr/local/bin\"", "\n\n", "# Upgrade pip and setuptools\n", - "PYPI_URL=", - { - "Ref": "PypiIndexUrl" - }, - "\n", "pip install", " --index-url=\"$PYPI_URL\"", - " --upgrade pip 'setuptools<37;python_version<\"2.7\"' 'setuptools;python_version>=\"2.7\"'\n\n", + " --upgrade pip '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", "pip install", " --index-url=\"$PYPI_URL\"", - " --upgrade pyopenssl ndg-httpsclient pyasn1\n\n", + " --upgrade cffi\n", + "pip install", + " --index-url=\"$PYPI_URL\"", + " --upgrade pyopenssl ndg-httpsclient pyasn1 'cryptography<2.2;python_version<\"2.7\"' 'cryptography;python_version>=\"2.7\"'", + "\n\n", "if [[ $(rpm --quiet -q aws-cfn-bootstrap || pip show --quiet aws-cfn-bootstrap)$? -ne 0 ]]\n", "then\n", " # Get cfn utils\n", " pip install", " --index-url=\"$PYPI_URL\"", - " --upgrade ", + " --upgrade --upgrade-strategy only-if-needed ", { "Ref": "CfnBootstrapUtilsUrl" }, From e71d08b74513403a31b85afd72cc436fd7792804 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Fri, 13 Apr 2018 12:20:17 -0400 Subject: [PATCH 2/2] Bumps version to 1.3.1 --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index bc506757..92e63c3a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.3.0 +current_version = 1.3.1 commit = True message = Bumps version to {new_version} tag = False