From 5b48a2e0fe3ebcc71e9f2b2377c36dbc3dce0209 Mon Sep 17 00:00:00 2001 From: Dwight Hubbard <254983+dwighthubbard@users.noreply.github.com> Date: Fri, 25 Jan 2019 15:50:53 -0800 Subject: [PATCH] Fail broken docker build (#10) * Update docker_build.sh Downgrade pip before installing invirtualenv because pip 19.0+ doesn't support installing the invirtualenv pyinstaller dependency * Update setup.py Remove pyinstaller from the install requirements since it was only used by plugins that aren't present in the this package. * Update .travis.yml * Update .travis.yml --- .travis.yml | 7 +++---- invirtualenv_plugins/docker_scripts/docker_build.sh | 4 +++- setup.py | 3 +-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8164ad4..da03710 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,14 @@ language: python python: - 2.7 - - 3.4 - 3.5 - 3.6 install: - pip install --upgrade setuptools - - pip install --upgrade pip - - pip install --upgrade . - - pip install --upgrade pycodestyle pylint pytest pytest-cov coveralls + - pip install "pip<19.0" + - pip install . + - pip install --upgrade pycodestyle pylint pytest pytest-cov coveralls script: - pycodestyle invirtualenv diff --git a/invirtualenv_plugins/docker_scripts/docker_build.sh b/invirtualenv_plugins/docker_scripts/docker_build.sh index e27bf0a..9a9e3a5 100644 --- a/invirtualenv_plugins/docker_scripts/docker_build.sh +++ b/invirtualenv_plugins/docker_scripts/docker_build.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -e INVIRTUALENV_DIR="/var/lib/invirtualenv" INSTALLVENV="/var/lib/invirtualenv/installvenv" @@ -28,7 +29,8 @@ function install_invirtualenv { venv_pip="${INSTALLVENV}/bin/pip" ${venv_pip} install -U setuptools - ${venv_pip} install -U pip wheel virtualenv + ${venv_pip} install -U wheel virtualenv + ${venv_pip} install "pip<19.0" ${venv_pip} install -U invirtualenv } diff --git a/setup.py b/setup.py index f3e8d03..19c34d9 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ from setuptools import setup # Default version number -BASE_VERSION = '18.8.0' +BASE_VERSION = '19.1.0' METADATA_FILENAME = 'invirtualenv/package_metadata.json' BASEPATH = os.path.dirname(os.path.abspath(__file__)) METADATA_FILE = os.path.join(BASEPATH, METADATA_FILENAME) @@ -103,7 +103,6 @@ def get_version(version_file): }, install_requires=[ 'jinja2', - 'pyinstaller', 'requests', 'six>=1.5', 'virtualenv',