diff --git a/.travis.yml b/.travis.yml index e8941654..ca82befa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: language: generic env: - TOX_ENV=py27 - - PYTHON_VERSION='2.7' + - PYTHON_VERSION='2.7.9' - os: osx language: generic env: @@ -40,7 +40,8 @@ branches: before_install: | if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then # From https://pythonhosted.org/CodeChat/.travis.yml.html - brew install pyenv-virtualenv + # Homebrew currently fails after updating. See also: https://discuss.circleci.com/t/brew-install-fails-while-updating/32992/4 + HOMEBREW_NO_AUTO_UPDATE=1 brew install pyenv-virtualenv eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)" # See https://github.com/travis-ci/travis-ci/issues/4834, but diff --git a/requirements.in b/requirements.in index 3ac4583b..22932550 100644 --- a/requirements.in +++ b/requirements.in @@ -1,13 +1,15 @@ click docker-py -PyYAML -requests +#PyYAML +#requests retrying six tqdm scrapinghub>=2.0.3 +pip<19.3 + # address known vulnerabilities requests>=2.20.0 # CVE-2018-18074 pyyaml>=4.2b1 # CVE-2017-18342 diff --git a/requirements.txt b/requirements.txt index a2bba22e..68744217 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,3 +20,6 @@ six==1.10.0 tqdm==4.11.2 urllib3==1.25.3 # via requests websocket-client==0.37.0 # via docker-py + +# The following packages are considered to be unsafe in a requirements file: +# pip==19.2.3 diff --git a/setup.py b/setup.py index 01abbe29..b11d9fff 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ install_requires=[ 'click', 'docker-py', - 'pip', + 'pip<19.3', 'PyYAML', 'retrying', 'requests', diff --git a/shub/utils.py b/shub/utils.py index 6a988ed1..70d305e6 100644 --- a/shub/utils.py +++ b/shub/utils.py @@ -28,7 +28,11 @@ try: from pip import main as pip_main except: - from pip._internal import main as pip_main + try: + # pip>=19.3 + from pip._internal.main import main as pip_main + except ImportError: + from pip._internal import main as pip_main from scrapinghub import ScrapinghubClient, ScrapinghubAPIError, HubstorageClient