From 9e8216aa5eb5bb7f562f3433d3588a78d6cbed0d Mon Sep 17 00:00:00 2001 From: Maximilian Weiss Date: Mon, 10 Jan 2022 22:18:38 +0000 Subject: [PATCH] Fix some outdated Zuul dependency errors Shpinx incorrectly claims it wants docutils >=0.18 but that is an error and older versions fail with that, as mentioned here: https://github.com/sphinx-doc/sphinx/issues/9841 Additionally, the repo URL for OpenSUSE 15.3 python has changed. Change-Id: I9bee6cf3ad7aaba80a44f2bd2f917b16c776c0d7 --- doc/requirements.txt | 1 + images/pegleg/Dockerfile.opensuse_15 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 0d1f8577..00d1a2b2 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -6,6 +6,7 @@ sphinx==3.1.0 oslosphinx==4.18.0 # Apache-2.0 sphinx_rtd_theme==0.4.3 +docutils==0.17.1 # UML image generation plantuml==0.3.0 diff --git a/images/pegleg/Dockerfile.opensuse_15 b/images/pegleg/Dockerfile.opensuse_15 index 1658155a..2001aca8 100644 --- a/images/pegleg/Dockerfile.opensuse_15 +++ b/images/pegleg/Dockerfile.opensuse_15 @@ -31,7 +31,7 @@ RUN set -x \ python3-pip \ python3-setuptools \ which \ - && zypper --non-interactive ar -f https://download.opensuse.org/repositories/devel:languages:python/openSUSE_Leap_15.3/devel:languages:python.repo \ + && zypper --non-interactive ar -f https://download.opensuse.org/repositories/devel:/languages:/python/15.3/devel:languages:python.repo \ && zypper --non-interactive --gpg-auto-import-keys refresh devel_languages_python \ && zypper --non-interactive install python3-six-1.16.0-lp153.103.1.noarch RUN pip3 install -U pip \