From 121d2b5355e4578fea2638a98ae53fdaf2d9f1d9 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Fri, 17 Nov 2017 16:44:15 -0600 Subject: [PATCH] Clean up required packages This patch does two things to clean up gate package requirements, adding a bindep file and moving packages to the right location. Bindep controls which system packages are installed. If a project does not have a bindep.txt file present, the gate jobs will fall back to a common list of packages. These include things like mariadb and various clients that are not needed for specs repos. Added a basic bindep.txt file with just the things we need to ensure are present for building the docs in specs. There are also plans to stop looking at requirements.txt for specs since these repos do not install Python code. The two locations that are looked at are test-requirements.txt for running included tests, and doc/requirements.txt for anything needed for doc builds such as sphinx and plugins. Change-Id: I3a222d7eec32b0d5ae6ef4ad20b34603931e13d6 --- bindep.txt | 7 +++++++ doc/requirements.txt | 3 +++ requirements.txt => test-requirements.txt | 3 --- tox.ini | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 bindep.txt create mode 100644 doc/requirements.txt rename requirements.txt => test-requirements.txt (62%) diff --git a/bindep.txt b/bindep.txt new file mode 100644 index 00000000..0420ff12 --- /dev/null +++ b/bindep.txt @@ -0,0 +1,7 @@ +# This is a cross-platform list tracking distribution packages needed for +# install and tests; +# see https://docs.openstack.org/infra/bindep/ for additional information. + +gettext [!platform:suse] +gettext-runtime [platform:suse] +graphviz [test] diff --git a/doc/requirements.txt b/doc/requirements.txt new file mode 100644 index 00000000..021350ac --- /dev/null +++ b/doc/requirements.txt @@ -0,0 +1,3 @@ +openstackdocstheme>=1.11.0 +sphinx>=1.6.2 # BSD +yasfb>=0.5.1 diff --git a/requirements.txt b/test-requirements.txt similarity index 62% rename from requirements.txt rename to test-requirements.txt index 32cefcda..3a8880f1 100644 --- a/requirements.txt +++ b/test-requirements.txt @@ -1,8 +1,5 @@ openstackdocstheme>=1.11.0 -pbr>=0.6,<1.0 sphinx>=1.6.2 # BSD -testrepository>=0.0.18 -testtools>=0.9.34 flake8 yasfb>=0.5.1 doc8>=0.6.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index d697ba50..38f78bdc 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ usedevelop = True install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} -deps = -r{toxinidir}/requirements.txt +deps = -r{toxinidir}/test-requirements.txt [testenv:docs] whitelist_externals = rm