From 4393a372eaa2b06b1e0e248a4d3072fb1ba776a9 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 20 May 2019 08:09:35 +0200 Subject: [PATCH] Fix jobs Non-voting jobs should never run in gate, remove the non-voting requirements change - and the template as well. Change docs building job to newer tox-docs which does "tox -e docs" directly. Update sphinx requirements for python3. Depends-On: https://review.opendev.org/660024 Change-Id: I4111e0f94ee5d0f1ed07743679e17b28ac70a518 --- .zuul.yaml | 7 +------ test-requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index c59a67f..8b2dc99 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,16 +1,11 @@ - project: templates: - - check-requirements - openstack-python-jobs - openstack-python35-jobs - publish-to-pypi check: jobs: - - build-openstack-sphinx-docs: + - tox-docs: voting: false - requirements-check: voting: false - gate: - jobs: - - requirements-check: - voting: false diff --git a/test-requirements.txt b/test-requirements.txt index c9dbbe5..577bde4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,6 +2,7 @@ flake8 github3.py hacking mock -sphinx>=1.6.5 +sphinx>=1.6.5,<2.0.0;python_version=='2.7' # BSD +sphinx>=1.6.5;python_version>='3.4' # BSD stestr>=1.0.0 testtools>=2.2.0