From f6f2699c782fe9b31d7783926714a37ebdbb6746 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 7 Dec 2018 08:46:26 +0100 Subject: [PATCH] Cleanup running jobs With the changed PTI doc building, this repo can now use the standard way of building docs, use publish-openstack-docs-pti template and remove custom jobs. Since this repo is not co-installed, it does not need requirements and lower-constraints - like none of the documentation projects. Remove these. Remove also lower-constraints tox environment and unused pip install command from tox.ini as the default is just fine. Remove passenv from docs environment, this is not needed with current CI jobs anymore. Change-Id: I52544b825d3de626f25a81acdb0f62e73771051a --- .zuul.yaml | 22 +------------------- lower-constraints.txt | 48 ------------------------------------------- tox.ini | 10 --------- 3 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 lower-constraints.txt diff --git a/.zuul.yaml b/.zuul.yaml index c0f8c04..2baaeb6 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,29 +1,9 @@ -- job: - name: build-i18n-docs - description: | - openstack/i18n has a special doc build that does not match the normal - OpenStack PTI. - parent: tox-docs - vars: - tox_envlist: docs - tox_constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt' - required-projects: - - openstack/requirements - success-url: html/ - - project: templates: - - check-requirements + - publish-openstack-docs-pti check: jobs: - - build-i18n-docs - - openstack-tox-lower-constraints - openstack-tox-pep8 gate: jobs: - - build-i18n-docs - - openstack-tox-lower-constraints - openstack-tox-pep8 - post: - jobs: - - publish-openstack-tox-docs diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index 2cecedf..0000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,48 +0,0 @@ -alabaster==0.7.10 -Babel==2.5.3 -beautifulsoup4==4.6.0 -certifi==2018.1.18 -chardet==3.0.4 -debtcollector==1.19.0 -doc8==0.8.0 -docutils==0.14 -dulwich==0.19.0 -flake8==2.2.4 -hacking==0.10.3 -idna==2.6 -imagesize==1.0.0 -iso8601==0.1.12 -Jinja2==2.10 -lxml==4.1.1 -MarkupSafe==1.0 -mccabe==0.2.1 -monotonic==1.4 -msgpack==0.5.6 -netaddr==0.7.19 -netifaces==0.10.6 -openstackdocstheme==1.28 -oslo.config==5.2.0 -oslo.context==2.20.0 -oslo.i18n==3.20.0 -oslo.log==3.37.0 -oslo.serialization==2.25.0 -oslo.utils==3.36.0 -pbr==3.1.1 -pep8==1.5.7 -pyflakes==0.8.1 -Pygments==2.2.0 -pyinotify==0.9.6 -pyparsing==2.2.0 -python-dateutil==2.7.0 -pytz==2018.3 -PyYAML==3.12 -requests==2.18.4 -restructuredtext-lint==1.1.3 -rfc3986==1.1.0 -six==1.11.0 -snowballstemmer==1.2.1 -Sphinx==1.6.5 -sphinxcontrib-websupport==1.0.1 -stevedore==1.28.0 -urllib3==1.22 -wrapt==1.10.11 diff --git a/tox.ini b/tox.ini index af4bba9..119f59f 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,6 @@ skipsdist = True [testenv] basepython=python3 -#install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} usedevelop = True setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/requirements.txt @@ -24,9 +23,6 @@ commands = {posargs} commands = {posargs} [testenv:docs] -passenv = - # Required by add-marker.sh - ZUUL* commands = doc8 doc/source # Build translated guides @@ -59,9 +55,3 @@ max-line-length = 80 # D000: Check RST validity # - cannot handle "none" for code-block directive ignore = D000 - -[testenv:lower-constraints] -deps = - -c{toxinidir}/lower-constraints.txt - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt