Skip to content

Commit

Permalink
Merge pull request #30 from lorengordon/py26-cryptography
Browse files Browse the repository at this point in the history 
Includes more fixes for running on py2.6
  • Loading branch information
@lorengordon
lorengordon authored Apr 13, 2018
2 parents 51fef34 + e71d08b commit 216d366
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
33 changes: 20 additions & 13 deletions modules/lx-autoscale/watchmaker-lx-autoscale.cfn.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
},
Expand Down
33 changes: 20 additions & 13 deletions modules/lx-instance/watchmaker-lx-instance.cfn.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
},
Expand Down

0 comments on commit 216d366

Please sign in to comment.