diff --git a/playbooks/install.py b/playbooks/install.py index fb478ddf..4d557373 100644 --- a/playbooks/install.py +++ b/playbooks/install.py @@ -36,21 +36,17 @@ def install_bench(args): # secure pip installation if find_executable('pip'): run_os_command({ - 'yum': 'sudo pip install --upgrade setuptools pip', - 'apt-get': 'sudo pip install --upgrade setuptools pip', - 'brew': "sudo pip install --upgrade setuptools pip --user" + 'pip': 'sudo pip install --upgrade setuptools pip' }) else: if not os.path.exists("get-pip.py"): run_os_command({ - 'apt-get': 'wget https://bootstrap.pypa.io/get-pip.py', - 'yum': 'wget https://bootstrap.pypa.io/get-pip.py' + 'wget': 'wget https://bootstrap.pypa.io/get-pip.py' }) success = run_os_command({ - 'apt-get': 'sudo python get-pip.py', - 'yum': 'sudo python get-pip.py', + 'python': 'sudo python get-pip.py --force-reinstall' }) if success: diff --git a/setup.py b/setup.py index fc623809..69379c67 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,8 @@ from setuptools import setup, find_packages -from pip.req import parse_requirements +try: # for pip >= 10 + from pip._internal.req import parse_requirements +except ImportError: # for pip <= 9.0.3 + from pip.req import parse_requirements import re, ast # get version from __version__ variable in bench/__init__.py