diff options
author | Zuul <zuul@review.opendev.org> | 2019-10-14 21:10:09 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2019-10-14 21:10:09 +0000 |
commit | dcb19586b507e9fa9ac21c4da8e3ac003480b23f (patch) | |
tree | 158be6e6fbedfd2daeaf70198c8797c50c8ea136 | |
parent | 0ef350e466f0615e651f6ca21874b4345720a751 (diff) | |
parent | cee637ad9c8bc1f19d785e658d80d1a9f106981f (diff) | |
download | os-client-config-dcb19586b507e9fa9ac21c4da8e3ac003480b23f.tar.gz |
Merge "Stop testing python2.7"
-rw-r--r-- | .zuul.yaml | 21 | ||||
-rw-r--r-- | setup.cfg | 5 | ||||
-rw-r--r-- | tox.ini | 9 |
3 files changed, 5 insertions, 30 deletions
@@ -1,17 +1,4 @@ - job: - name: os-client-config-tox-py27-tips - parent: openstack-tox-py27 - description: | - Run tox python 27 unittests against master of important libs - vars: - tox_install_siblings: true - zuul_work_dir: src/opendev.org/openstack/os-client-config - required-projects: - - openstack/keystoneauth - - openstack/openstacksdk - - openstack/os-client-config - -- job: name: os-client-config-tox-py37-tips parent: openstack-tox-py37 description: | @@ -28,21 +15,17 @@ name: os-client-config-tox-tips check: jobs: - - os-client-config-tox-py27-tips - os-client-config-tox-py37-tips gate: jobs: - - os-client-config-tox-py27-tips - os-client-config-tox-py37-tips - project: templates: - check-requirements - - lib-forward-testing - lib-forward-testing-python3 - openstack-lower-constraints-jobs - - openstack-python-jobs - - openstack-python3-train-jobs + - openstack-python3-ussuri-jobs - os-client-config-tox-tips - publish-openstack-docs-pti - release-notes-jobs-python3 @@ -50,7 +33,9 @@ - shade-tox-tips check: jobs: + - openstack-tox-pep8 - osc-functional-devstack-tips gate: jobs: + - openstack-tox-pep8 - osc-functional-devstack-tips @@ -13,8 +13,6 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 @@ -31,6 +29,3 @@ warning-is-error = 1 [upload_sphinx] upload-dir = doc/build/html - -[wheel] -universal = 1 @@ -1,12 +1,13 @@ [tox] minversion = 2.0 -envlist = py37,py27,pep8 +envlist = py37,pep8 skipsdist = True [testenv] usedevelop = True passenv = UPPER_CONSTRAINTS_FILE install_command = pip install -U {opts} {packages} +basepython = python3 setenv = VIRTUAL_ENV={envdir} LANG=en_US.UTF-8 @@ -23,7 +24,6 @@ commands = stestr run {posargs} stestr slowest [testenv:pep8] -basepython = python3 usedevelop = False skip_install = True deps = @@ -37,11 +37,9 @@ commands = flake8 os_client_config [testenv:venv] -basepython = python3 commands = {posargs} [testenv:cover] -basepython = python3 setenv = {[testenv]setenv} PYTHON=coverage run --source os_client_config --parallel-mode @@ -52,7 +50,6 @@ commands = coverage xml -o cover/coverage.xml [testenv:docs] -basepython = python3 skip_install = True deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} @@ -62,7 +59,6 @@ commands = sphinx-build -W -d doc/build/doctrees -b html doc/source/ doc/build/html [testenv:releasenotes] -basepython = python3 skip_install = True deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} @@ -76,7 +72,6 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,releasenotes/source/con [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt |