Skip to content
This repository has been archived by the owner on Nov 3, 2020. It is now read-only.

Commit

Permalink
fix/pin (#68)
Browse files Browse the repository at this point in the history
* pin boto

* pin moto

* pin pyopenssl

* upgrade pip and new pip deps
  • Loading branch information
quasiben committed Feb 3, 2017
1 parent db5cc04 commit 9c60d92
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ install:
- which python
- python setup.py sdist --quiet
- pip install dist/*.tar.gz
- conda list

script:
# boto has issues with python3 on travisCI
Expand Down
18 changes: 16 additions & 2 deletions dask_ec2/salt.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,20 @@ def __install_python_pip():
raise DaskEc2Exception("%s\nCouldn't install python-pip. Error is above (maybe try again)" %
e.last_exception)

@retry(retries=3, wait=0)
def __upgrade_pip():
cmd = "pip install --upgrade pip packaging appdirs six"
ret = master.exec_command(cmd, sudo=True)
if ret["exit_code"] != 0:
raise Exception(ret["stderr"])

try:
__upgrade_pip()
except RetriesExceededException as e:
raise DaskEc2Exception(
"%s\nCouldn't upgrade pip. Error is above (maybe try again)" %
e.last_exception)

@retry(retries=3, wait=0)
def __install_salt_rest_api():
cmd = "pip install cherrypy"
Expand All @@ -177,10 +191,10 @@ def __install_salt_rest_api():

@retry(retries=3, wait=0)
def __install_pyopensll():
cmd = "pip install PyOpenSSL"
cmd = "pip install PyOpenSSL==16.2.0"
ret = master.exec_command(cmd, sudo=True)
if ret["exit_code"] != 0:
raise Exception(ret["stderr"].decode('utf-8'))
raise Exception(ret["stderr"])

try:
__install_pyopensll()
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ dependencies:
- yaml
- pyyaml
- click
- boto3
- boto3 ==1.4.3
- pytest
- coverage
- pytest-cov
- pylint
- pip:
- moto
- moto==0.4.30
- twine
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
six
click
paramiko
boto3
boto3==1.4.3
pyyaml

# Test
Expand Down

0 comments on commit 9c60d92

Please sign in to comment.