From c891b09f568eb11fa603898506f2f76dd9df5a98 Mon Sep 17 00:00:00 2001 From: "Dr. Jens Harbott" Date: Fri, 1 Nov 2024 08:31:10 +0100 Subject: [PATCH] Fix docs builds for current Ubuntu versions Need to use python3. Update the readme accordingly. Update tox.ini for current tox. Change-Id: Ie225d08850507dab743b6e58474839a5d48a2f06 --- README.rst | 6 +++--- bindep.txt | 2 +- tox.ini | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 651d87d5b..03724c775 100644 --- a/README.rst +++ b/README.rst @@ -7,7 +7,7 @@ API-Site repository +++++++++++++++++++ This repository contains the index page for -https://developer.openstack.org in the `www` directory. +https://developer.openstack.org in the ``www`` directory. To complete code reviews in this repository, use the standard OpenStack Gerrit `workflow `_. @@ -23,9 +23,9 @@ Prerequisites To build the documentation locally, you must install Python and `Python Tox `_. -To install Tox for Ubuntu 14.04 or later:: +To install Tox and dependencies for Ubuntu 22.04 or later:: - apt-get install python-tox python-dev libxml2-dev libxslt1-dev + apt-get install python3-tox python3-dev libxml2-dev libxslt1-dev To build all the documentation after installing Python and Tox:: diff --git a/bindep.txt b/bindep.txt index 8e0e16122..a0abdbb0b 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,7 +1,7 @@ # This is a cross-platform list tracking distribution packages needed by tests; # see https://docs.openstack.org/infra/bindep/ for additional information. -python-dev [platform:dpkg] +python3-dev [platform:dpkg] python-devel [platform:rpm] zlib-devel [platform:rpm] zlib1g-dev [platform:dpkg] diff --git a/tox.ini b/tox.ini index aa017dcd2..c722ee7b9 100644 --- a/tox.ini +++ b/tox.ini @@ -8,11 +8,12 @@ basepython = python3 setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/test-requirements.txt -whitelist_externals = +allowlist_externals = bash mkdir mv rsync + {toxinidir}/tools/build-index.sh [testenv:venv] commands = {posargs}