summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-03-18 16:08:32 +0000
committerGerrit Code Review <review@openstack.org>2019-03-18 16:08:32 +0000
commite392e7062adc5d33296d14f9d97dc869cc69bed9 (patch)
treed4bc3b1fffee1645d1f3ecaf7c37c444a50d3c81
parent9fb039cb5af41b099f58b8d80031cc7386d0ab4e (diff)
parent1dbc250a22d6f2e42c4a33f6f44de6eac3e5655a (diff)
Merge "Revert "For OpenSUSE Leap, use more recent version of zVMCloudConnector""
-rwxr-xr-xscripts/requirements.sh9
1 files changed, 0 insertions, 9 deletions
diff --git a/scripts/requirements.sh b/scripts/requirements.sh
index 9d53a1a..8c380f4 100755
--- a/scripts/requirements.sh
+++ b/scripts/requirements.sh
@@ -20,15 +20,6 @@ fi
20# anymore 20# anymore
21sed -i '/python-qpid-proton===0.14.0/d' /upper-constraints.txt 21sed -i '/python-qpid-proton===0.14.0/d' /upper-constraints.txt
22 22
23# zVMCloudConnector for queens requires python<=3.5, but Leap has already python3.6
24case ${distro} in
25 opensuse|opensuse-leap|opensuse-tumbleweed|sles)
26 if [[ "${PYTHON3}" != "no" ]] && [[ "${PROJECT_REF}" == "stable/queens" ]]; then
27 sed -i 's/zVMCloudConnector===0.3.5/zVMCloudConnector===1.0.0/' /upper-constraints.txt
28 fi
29 ;;
30esac
31
32if [[ "${PYTHON3}" == "no" ]]; then 23if [[ "${PYTHON3}" == "no" ]]; then
33 ignore_wheels=py2 24 ignore_wheels=py2
34else 25else