diff options
| author | drebs <drebs@leap.se> | 2016-05-19 17:19:31 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2016-06-08 12:42:20 -0300 |
| commit | f01b2cf3aa27350eae788152f95c4f9ca8e11b9f (patch) | |
| tree | 728d6b5e0cf5b626807bb7a1dc996a9cdb90ac6f | |
| parent | d11849105e06b16e03ad938b6e41e934e99a33cc (diff) | |
[bug] install pip from default location
Old versions of pip do not accept the --trusted-host option and will complain
when trying to upgrade pip from wheel. To fix that we upgrade pip from usual
location instead of doing it from wheel.
| -rwxr-xr-x | client/pkg/pip_install_requirements.sh | 2 | ||||
| -rwxr-xr-x | common/pkg/pip_install_requirements.sh | 2 | ||||
| -rwxr-xr-x | server/pkg/pip_install_requirements.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/client/pkg/pip_install_requirements.sh b/client/pkg/pip_install_requirements.sh index d0479365..1f5ac5f6 100755 --- a/client/pkg/pip_install_requirements.sh +++ b/client/pkg/pip_install_requirements.sh @@ -80,5 +80,5 @@ insecure_flags=`return_insecure_flags` packages=`return_packages` pip install -U wheel -pip install $install_options pip +pip install -U pip pip install $install_options $insecure_flags $packages diff --git a/common/pkg/pip_install_requirements.sh b/common/pkg/pip_install_requirements.sh index d0479365..1f5ac5f6 100755 --- a/common/pkg/pip_install_requirements.sh +++ b/common/pkg/pip_install_requirements.sh @@ -80,5 +80,5 @@ insecure_flags=`return_insecure_flags` packages=`return_packages` pip install -U wheel -pip install $install_options pip +pip install -U pip pip install $install_options $insecure_flags $packages diff --git a/server/pkg/pip_install_requirements.sh b/server/pkg/pip_install_requirements.sh index d0479365..1f5ac5f6 100755 --- a/server/pkg/pip_install_requirements.sh +++ b/server/pkg/pip_install_requirements.sh @@ -80,5 +80,5 @@ insecure_flags=`return_insecure_flags` packages=`return_packages` pip install -U wheel -pip install $install_options pip +pip install -U pip pip install $install_options $insecure_flags $packages |