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
This commit is contained in:
parent
e403f3e673
commit
bee7811c80
@ -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
|
||||
|
3
doc/requirements.txt
Normal file
3
doc/requirements.txt
Normal file
@ -0,0 +1,3 @@
|
||||
openstackdocstheme>=1.11.0 # Apache-2.0
|
||||
sphinx>=1.6.2 # BSD
|
||||
sphinxcontrib-httpdomain>=1.7.0
|
@ -1,6 +1,6 @@
|
||||
===================================
|
||||
=====================================
|
||||
Man pages for Heat cfntools utilities
|
||||
===================================
|
||||
=====================================
|
||||
|
||||
-------------
|
||||
Heat cfntools
|
||||
|
8
lower-constraints.txt
Normal file
8
lower-constraints.txt
Normal file
@ -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
|
@ -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
|
||||
|
@ -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
|
||||
|
14
tox.ini
14
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
|
||||
|
Loading…
Reference in New Issue
Block a user