From 07f91b1b2948e5bc2af3534f6082d03f60e0c08b Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 17 May 2017 08:28:49 -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: I9f880628215d9ab5f1183f96c47142606bada8ce --- Gemfile | 4 +--- bindep.txt | 11 +++++++++++ tox.ini | 3 +++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 1fab60854..caddc65d8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :test, :system_tests do - gem 'puppet-openstack_spec_helper', - :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper', - :require => false + gem 'puppet-openstack_spec_helper', :require => 'false', :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper' end if facterversion = ENV['FACTER_GEM_VERSION'] diff --git a/bindep.txt b/bindep.txt index e69de29bb..7cdd58e59 100644 --- a/bindep.txt +++ b/bindep.txt @@ -0,0 +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 aea06c84f..cd122cbf3 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