diff options
| author | Elod Illes <elod.illes@est.tech> | 2019-06-27 12:57:48 +0200 |
|---|---|---|
| committer | Elod Illes <elod.illes@est.tech> | 2019-07-10 17:43:08 +0200 |
| commit | f10075c4b36cd2375234e8bb93247be13869332a (patch) | |
| tree | 9f34933ccab03ce9f0f153b24968906c04aa9bd6 | |
| parent | bdd41bd04810f279d8938af2d1fbc595c3623fcb (diff) | |
| download | stevedore-f10075c4b36cd2375234e8bb93247be13869332a.tar.gz | |
Add local bindep.txtqueens-eolstable/queens
As it was announced [1] global bindep-fallback.txt was removed and now
projects need to have a local bindep.txt to be able to install binary
dependencies for testing.
In documentation zuul job graphviz package ('dot' command) is needed.
Without that the job fails with:
dot command 'dot' cannot be run (needed for graphviz output),
check the graphviz_dot setting
[1] http://lists.openstack.org/pipermail/openstack-discuss/2019-June/007272.html
(cherry picked from commit feac47186d79569bb564e18216e07f18ed5ccd8b)
(cherry picked from commit caf65ed26066b5f7d13cc50e67f1df852414b2dc)
Conflicts:
tox.ini
Note(elod.illes): conflict is due to that lower-constraints tox env is
not present in Queens. Also patch needed to fix different errors as in
Queens the basepython is 2.7 which needs sphinx requirements to be
updated and does not need sphinx logging deprecation fix as in Rocky.
Change-Id: I5efddfc72e9dc0dd1b8b9e1e37708e1d30ef3c39
(cherry picked from commit 39f61e4392ef3c0f1852b87a9d2cb0bc4f410bec)
| -rw-r--r-- | bindep.txt | 7 | ||||
| -rw-r--r-- | doc/requirements.txt | 3 | ||||
| -rw-r--r-- | test-requirements.txt | 3 | ||||
| -rw-r--r-- | tox.ini | 11 |
4 files changed, 22 insertions, 2 deletions
diff --git a/bindep.txt b/bindep.txt new file mode 100644 index 0000000..7a2df73 --- /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. + +# graphviz is necessary for documentation build +graphviz [!platform:gentoo] +media-gfx/graphviz [platform:gentoo] + diff --git a/doc/requirements.txt b/doc/requirements.txt index 597b54e..6fd065e 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,4 +3,5 @@ # process, which may cause wedges in the gate later. openstackdocstheme>=1.18.1 # Apache-2.0 reno>=2.5.0 # Apache-2.0 -sphinx!=1.6.6,>=1.6.2 # BSD +sphinx>=1.6.2,!=1.6.6,<2.0.0;python_version=='2.7' # BSD +sphinx>=1.6.2,!=1.6.6;python_version>='3.4' # BSD diff --git a/test-requirements.txt b/test-requirements.txt index 6a3828e..592fc8c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,6 +6,7 @@ mock>=2.0.0 # BSD coverage!=4.4,>=4.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD # sphinx is needed for testing the sphinxext module -sphinx!=1.6.6,>=1.6.2 # BSD +sphinx>=1.6.2,!=1.6.6,<2.0.0;python_version=='2.7' # BSD +sphinx>=1.6.2,!=1.6.6;python_version>='3.4' # BSD # Bandit security code scanner bandit>=1.1.0 # Apache-2.0 @@ -43,3 +43,14 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens} -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html + +[testenv:bindep] +# Do not install any requirements. We want this to be fast and work even if +# system dependencies are missing, since it's used to tell you what system +# dependencies are missing! This also means that bindep must be installed +# separately, outside of the requirements files, and develop mode disabled +# explicitly to avoid unnecessarily installing the checked-out repo too (this +# further relies on "tox.skipsdist = True" above). +deps = bindep +commands = bindep test +usedevelop = False |