From a5941bf3298af247bf98eb811f633f72378cf759 Mon Sep 17 00:00:00 2001 From: Gregory Haynes Date: Thu, 23 Oct 2014 08:01:17 -0700 Subject: [PATCH] Remove pip install --pre We were installing some packages with support for prerelease versions in expectation of needing it in our CI. This turns out to not be needed so we should remove it. Change-Id: I7ae440d3534e33144942c2230a88cf54f8a153d3 --- elements/heat-cfntools/install.d/05-heat-cfntools | 2 +- .../install.d/os-apply-config-source-install/10-os-apply-config | 2 +- .../os-collect-config-source-install/10-os-collect-config | 2 +- .../os-net-config-source-install/50-os-net-config-source | 2 +- .../os-refresh-config-source-install/10-os-refresh-config | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/elements/heat-cfntools/install.d/05-heat-cfntools b/elements/heat-cfntools/install.d/05-heat-cfntools index 83fb0bbe5..f1c71b036 100755 --- a/elements/heat-cfntools/install.d/05-heat-cfntools +++ b/elements/heat-cfntools/install.d/05-heat-cfntools @@ -24,7 +24,7 @@ $VENV/bin/pip install -U pip $VENV/bin/pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. $VENV/bin/pip install -U 'pbr>=0.6,<1.0' -$VENV/bin/pip install --pre -U heat-cfntools +$VENV/bin/pip install -U heat-cfntools # symlink to /opt/aws/bin $VENV/bin/cfn-create-aws-symlinks --source $VENV/bin diff --git a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config index 583ab1df5..6b4771c2e 100755 --- a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config +++ b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config @@ -18,7 +18,7 @@ else /opt/stack/venvs/os-apply-config/bin/pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. /opt/stack/venvs/os-apply-config/bin/pip install -U 'pbr>=0.6,<1.0' - /opt/stack/venvs/os-apply-config/bin/pip install --pre -U os-apply-config + /opt/stack/venvs/os-apply-config/bin/pip install -U os-apply-config fi # Write the manifest of what was installed diff --git a/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config b/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config index e3ee25595..3e2c723d6 100755 --- a/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config +++ b/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config @@ -18,7 +18,7 @@ else /opt/stack/venvs/os-collect-config/bin/pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. /opt/stack/venvs/os-collect-config/bin/pip install -U 'pbr>=0.6,<1.0' - /opt/stack/venvs/os-collect-config/bin/pip install --pre -U os-collect-config + /opt/stack/venvs/os-collect-config/bin/pip install -U os-collect-config fi # Write the manifest of what was installed diff --git a/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source b/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source index c35f621f0..4c2d10e5a 100755 --- a/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source +++ b/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source @@ -18,7 +18,7 @@ else $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.6,<1.0' - $OS_NET_CONFIG_VENV_DIR/bin/pip install --pre -U os-net-config + $OS_NET_CONFIG_VENV_DIR/bin/pip install -U os-net-config fi # Write the manifest of what was installed diff --git a/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config b/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config index f53dd6fcf..e02b5694a 100755 --- a/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config +++ b/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config @@ -22,7 +22,7 @@ else /opt/stack/venvs/os-refresh-config/bin/pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. /opt/stack/venvs/os-refresh-config/bin/pip install -U 'pbr>=0.5.21,<1.0' - /opt/stack/venvs/os-refresh-config/bin/pip install --pre -U os-refresh-config + /opt/stack/venvs/os-refresh-config/bin/pip install -U os-refresh-config fi # Write the manifest of what was installed