From 3e78a46caf700aa6ba0bc176b3702c7ccfbf290c Mon Sep 17 00:00:00 2001 From: Andrii Ostapenko Date: Fri, 31 Jul 2020 22:29:40 -0500 Subject: [PATCH] Workaround unicode issue with py2 and scandir==1.4 Also move manila ocata to eol. Change-Id: I0282b57ab27a51698f55294037dd3429d6a11416 Signed-off-by: Andrii Ostapenko --- .zuul.d/manila.yaml | 2 ++ scripts/requirements.sh | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.zuul.d/manila.yaml b/.zuul.d/manila.yaml index 634b8c8e..38da9b63 100644 --- a/.zuul.d/manila.yaml +++ b/.zuul.d/manila.yaml @@ -14,6 +14,8 @@ parent: loci-base vars: project: manila + eol: + - ocata required-projects: - openstack/loci - openstack/requirements diff --git a/scripts/requirements.sh b/scripts/requirements.sh index 5cfba613..75f17fee 100755 --- a/scripts/requirements.sh +++ b/scripts/requirements.sh @@ -9,6 +9,9 @@ $(dirname $0)/install_packages.sh $(dirname $0)/clone_project.sh mv /tmp/requirements/{global-requirements.txt,upper-constraints.txt} / +# workaround unicode issue with 44.1.1 setuptools on python2 and scandir 1.4 +[[ "${PYTHON3}" == "no" ]] && pip install -c /upper-constraints.txt scandir ||: + # TODO: Make python-qpid-proton build here (possibly patch it) # or remove when python-qpid-proton is updated with build fix. # https://issues.apache.org/jira/browse/PROTON-1381