From 28dfbae96ccf867d7808a3967a77750c1098431a Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 17 May 2017 08:22:11 -0600 Subject: [PATCH] Update tox configuration Update the tox configuration to pull in the openstack upper-constraints.txt when running releasenotes. This will fix the releasenotes job that is currently failing due to a new version of sphinx. Additionally this change includes updates from puppet-modulesync-configs. Change-Id: Iede45a8ef863f602c98031781c53bb6627d74ace --- bindep.txt | 9 +++++++++ tox.ini | 3 +++ 2 files changed, 12 insertions(+) diff --git a/bindep.txt b/bindep.txt index 4f9b425..7cdd58e 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,2 +1,11 @@ # This is a cross-platform list tracking distribution packages needed by tests; # see http://docs.openstack.org/infra/bindep/ for additional information. + +libxml2-devel [test platform:rpm] +libxml2-dev [test platform:dpkg] +libxslt-devel [test platform:rpm] +libxslt1-dev [test platform:dpkg] +ruby-devel [test platform:rpm] +ruby-dev [test platform:dpkg] +zlib1g-dev [test platform:dpkg] +zlib-devel [test platform:rpm] diff --git a/tox.ini b/tox.ini index aea06c8..cd122cb 100644 --- a/tox.ini +++ b/tox.ini @@ -3,6 +3,9 @@ minversion = 1.6 skipsdist = True envlist = releasenotes +[testenv] +install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} + [testenv:releasenotes] deps = -rtest-requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html