From bee7811c80d123bb088a5e3b9683b1ab699e5bf9 Mon Sep 17 00:00:00 2001
From: Zane Bitter <zbitter@redhat.com>
Date: Wed, 18 Jul 2018 15:53:49 -0400
Subject: [PATCH 14/21] Modernise requirements
Conform to the PTI for docs builds, add lower-constraints jobs, and use
upper-constraints instead of synced global requirements constraints.
Change-Id: Iaf1b54b35d02dbb733c7782b178e4eb774c02ef6
---
.zuul.yaml | 8 +++++++-
doc/requirements.txt | 3 +++
doc/source/index.rst | 4 ++--
lower-constraints.txt | 8 ++++++++
requirements.txt | 6 +++---
test-requirements.txt | 6 +-----
tox.ini | 14 ++++++++++----
7 files changed, 34 insertions(+), 15 deletions(-)
create mode 100644 doc/requirements.txt
create mode 100644 lower-constraints.txt
diff --git a/.zuul.yaml b/.zuul.yaml
index 5e51b86..70cb437 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,7 +1,13 @@
- project:
templates:
- check-requirements
- - publish-openstack-sphinx-docs
+ - publish-openstack-docs-pti
- openstack-python35-jobs
- openstack-python-jobs
- publish-to-pypi
+ check:
+ jobs:
+ - openstack-tox-lower-constraints
+ gate:
+ jobs:
+ - openstack-tox-lower-constraints
diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..6f07765
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,3 @@
+openstackdocstheme>=1.11.0 # Apache-2.0
+sphinx>=1.6.2 # BSD
+sphinxcontrib-httpdomain>=1.7.0
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 54479b1..81b9277 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,6 +1,6 @@
-===================================
+=====================================
Man pages for Heat cfntools utilities
-===================================
+=====================================
-------------
Heat cfntools
diff --git a/lower-constraints.txt b/lower-constraints.txt
new file mode 100644
index 0000000..d884e51
--- /dev/null
+++ b/lower-constraints.txt
@@ -0,0 +1,8 @@
+boto==2.13.3
+hacking==0.9.0
+mock==1.0
+pbr==0.8
+psutil==1.1.1
+six==1.9.0
+testrepository==0.0.18
+testtools==0.9.34
diff --git a/requirements.txt b/requirements.txt
index e595465..a2d74fe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-pbr>=0.6,!=0.7,<1.0
-boto>=2.12.0,!=2.13.0
-psutil>=1.1.1,<2.0.0
+pbr!=2.1.0,>=0.8
+boto>=2.13.3
+psutil>=1.1.1
six>=1.9.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 412c495..7a25edc 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,8 +1,4 @@
-# Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.8.0,<0.9
-
+hacking>=0.9.0
mock>=1.0
-openstackdocstheme>=1.11.0 # Apache-2.0
-sphinx>=1.6.2 # BSD
testrepository>=0.0.18
testtools>=0.9.34
diff --git a/tox.ini b/tox.ini
index f974f36..f93f347 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,7 @@ envlist = py34,py27,pep8
[testenv]
setenv = VIRTUAL_ENV={envdir}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = python setup.py testr --slowest --testr-args='{posargs}'
@@ -29,7 +30,12 @@ show-source = true
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools
[testenv:docs]
-deps = -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements.txt
- sphinxcontrib-httpdomain
-commands = python setup.py build_sphinx
+deps = -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -W -b html doc/source doc/build/html
+
+[testenv:lower-constraints]
+basepython = python3
+deps =
+ -c{toxinidir}/lower-constraints.txt
+ -r{toxinidir}/requirements.txt
+ -r{toxinidir}/test-requirements.txt
--
2.20.1