Move content to subdir to support relocated packaging
Change-Id: I985f3bef71616c6674e31b68c5d8037cdb670884 Story: 2006166 Task: 37338 Depends-On: https://review.opendev.org/692861 Signed-off-by: Don Penney <don.penney@windriver.com>
This commit is contained in:
parent
cb6dfe2cdf
commit
4e006a92a5
28
.zuul.yaml
28
.zuul.yaml
|
@ -6,10 +6,30 @@
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-tox-linters
|
- openstack-tox-linters
|
||||||
- openstack-tox-pep8
|
- stx-distcloud-client-tox-pep8:
|
||||||
- openstack-tox-py27
|
voting: false
|
||||||
|
- stx-distcloud-client-tox-py27:
|
||||||
|
voting: false
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-tox-linters
|
- openstack-tox-linters
|
||||||
- openstack-tox-pep8
|
- stx-distcloud-client-tox-pep8:
|
||||||
- openstack-tox-py27
|
voting: false
|
||||||
|
- stx-distcloud-client-tox-py27:
|
||||||
|
voting: false
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: stx-distcloud-client-tox-py27
|
||||||
|
parent: tox
|
||||||
|
description: Run py27 for distcloud-client
|
||||||
|
vars:
|
||||||
|
tox_envlist: py27
|
||||||
|
tox_extra_args: -c distributedcloud-client/tox.ini
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: stx-distcloud-client-tox-pep8
|
||||||
|
parent: tox
|
||||||
|
description: Run pep8 for distcloud-client
|
||||||
|
vars:
|
||||||
|
tox_envlist: pep8
|
||||||
|
tox_extra_args: -c distributedcloud-client/tox.ini
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
# The order of packages is significant, because pip processes them in the order
|
||||||
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
|
# process, which may cause wedges in the gate later.
|
||||||
|
cliff>=2.3.0 # Apache-2.0
|
||||||
|
osc-lib>=1.2.0 # Apache-2.0
|
||||||
|
osprofiler>=1.4.0 # Apache-2.0
|
||||||
|
pbr>=2.0.0 # Apache-2.0
|
||||||
|
python-keystoneclient>=3.8.0 # Apache-2.0
|
||||||
|
PyYAML>=3.10.0 # MIT
|
||||||
|
requests!=2.12.2,!=2.13.0,>=2.10.0 # Apache-2.0
|
||||||
|
six>=1.9.0 # MIT
|
||||||
|
beautifulsoup4
|
|
@ -0,0 +1,16 @@
|
||||||
|
# The order of packages is significant, because pip processes them in the order
|
||||||
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
|
# process, which may cause wedges in the gate later.
|
||||||
|
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
||||||
|
pylint==1.4.5 # GPLv2
|
||||||
|
python-openstackclient>=3.3.0 # Apache-2.0
|
||||||
|
sphinx>=1.5.1 # BSD
|
||||||
|
unittest2 # BSD
|
||||||
|
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||||
|
mock>=2.0 # BSD
|
||||||
|
nose # LGPL
|
||||||
|
tempest>=14.0.0 # Apache-2.0
|
||||||
|
testtools>=1.4.0 # MIT
|
||||||
|
|
||||||
|
PyYAML>=3.1.0
|
||||||
|
yamllint>=0.5.2
|
|
@ -0,0 +1,103 @@
|
||||||
|
[tox]
|
||||||
|
minversion = 2.3
|
||||||
|
envlist = py27,pep8
|
||||||
|
skipsdist = True
|
||||||
|
|
||||||
|
[dcclient]
|
||||||
|
client_base_dir = .
|
||||||
|
|
||||||
|
[testenv]
|
||||||
|
install_command = pip install \
|
||||||
|
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
|
||||||
|
{opts} {packages}
|
||||||
|
setenv =
|
||||||
|
VIRTUAL_ENV={envdir}
|
||||||
|
OS_STDOUT_CAPTURE=1
|
||||||
|
OS_STDERR_CAPTURE=1
|
||||||
|
OS_TEST_TIMEOUT=60
|
||||||
|
# DISCOVER_DIRECTORY=dcmanagerclient/tests
|
||||||
|
|
||||||
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
|
-r{toxinidir}/requirements.txt
|
||||||
|
whitelist_externals =
|
||||||
|
rm
|
||||||
|
find
|
||||||
|
reno
|
||||||
|
|
||||||
|
[testenv:py27]
|
||||||
|
basepython = python2.7
|
||||||
|
commands =
|
||||||
|
find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete
|
||||||
|
stestr --test-path={[dcclient]client_base_dir}/dcmanagerclient/tests run '{posargs}'
|
||||||
|
|
||||||
|
[testenv:pep8]
|
||||||
|
basepython = python3
|
||||||
|
commands = flake8 {posargs}
|
||||||
|
|
||||||
|
[testenv:venv]
|
||||||
|
basepython = python3
|
||||||
|
commands = {posargs}
|
||||||
|
|
||||||
|
[testenv:cover]
|
||||||
|
basepython = python3
|
||||||
|
setenv =
|
||||||
|
PYTHON=coverage run --parallel-mode
|
||||||
|
PYTHONDONTWRITEBYTECODE=True
|
||||||
|
|
||||||
|
deps = {[testenv]deps}
|
||||||
|
coverage
|
||||||
|
|
||||||
|
commands =
|
||||||
|
find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete
|
||||||
|
coverage erase
|
||||||
|
stestr --test-path={[dcclient]client_base_dir}/dcmanagerclient/tests run '{posargs}'
|
||||||
|
coverage combine
|
||||||
|
coverage report
|
||||||
|
|
||||||
|
[testenv:debug]
|
||||||
|
basepython = python3
|
||||||
|
commands = oslo_debug_helper {posargs}
|
||||||
|
|
||||||
|
[flake8]
|
||||||
|
# E123, E125 skipped as they are invalid PEP-8.
|
||||||
|
show-source = True
|
||||||
|
ignore = E123,E125,H102
|
||||||
|
builtins = _
|
||||||
|
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*openstack/common*,*egg,build
|
||||||
|
|
||||||
|
[testenv:linters]
|
||||||
|
basepython = python3
|
||||||
|
# bashate ignore:
|
||||||
|
# E006 - accept long lines
|
||||||
|
# E040 - false positive on |& syntax (new in bash 4)
|
||||||
|
whitelist_externals = bash
|
||||||
|
commands =
|
||||||
|
bash -c "find {toxinidir} \
|
||||||
|
\( -name .tox -prune \) \
|
||||||
|
-o -type f -name '*.yaml' \
|
||||||
|
-print0 | xargs -0 yamllint"
|
||||||
|
|
||||||
|
[testenv:docs]
|
||||||
|
basepython = python3
|
||||||
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
|
commands =
|
||||||
|
rm -rf doc/build
|
||||||
|
sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
|
||||||
|
whitelist_externals = rm
|
||||||
|
|
||||||
|
[testenv:releasenotes]
|
||||||
|
basepython = python3
|
||||||
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
|
commands =
|
||||||
|
rm -rf releasenotes/build
|
||||||
|
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
||||||
|
whitelist_externals =
|
||||||
|
rm
|
||||||
|
reno
|
||||||
|
|
||||||
|
[testenv:newnote]
|
||||||
|
basepython = python3
|
||||||
|
# Re-use the releasenotes venv
|
||||||
|
envdir = {toxworkdir}/releasenotes
|
||||||
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
|
commands = reno new {posargs}
|
|
@ -1,12 +1,2 @@
|
||||||
# The order of packages is significant, because pip processes them in the order
|
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
stevedore>=1.20.0 # Apache-2.0
|
||||||
# process, which may cause wedges in the gate later.
|
|
||||||
cliff>=2.3.0 # Apache-2.0
|
|
||||||
osc-lib>=1.2.0 # Apache-2.0
|
|
||||||
osprofiler>=1.4.0 # Apache-2.0
|
|
||||||
pbr>=2.0.0 # Apache-2.0
|
|
||||||
python-keystoneclient>=3.8.0 # Apache-2.0
|
|
||||||
PyYAML>=3.10.0 # MIT
|
|
||||||
requests!=2.12.2,!=2.13.0,>=2.10.0 # Apache-2.0
|
|
||||||
six>=1.9.0 # MIT
|
|
||||||
beautifulsoup4
|
|
||||||
|
|
|
@ -1,16 +1,3 @@
|
||||||
# The order of packages is significant, because pip processes them in the order
|
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
|
||||||
# process, which may cause wedges in the gate later.
|
|
||||||
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
|
||||||
pylint==1.4.5 # GPLv2
|
|
||||||
python-openstackclient>=3.3.0 # Apache-2.0
|
|
||||||
sphinx>=1.5.1 # BSD
|
|
||||||
unittest2 # BSD
|
|
||||||
fixtures>=3.0.0 # Apache-2.0/BSD
|
|
||||||
mock>=2.0 # BSD
|
|
||||||
nose # LGPL
|
|
||||||
tempest>=14.0.0 # Apache-2.0
|
|
||||||
testtools>=1.4.0 # MIT
|
|
||||||
|
|
||||||
PyYAML>=3.1.0
|
PyYAML>=3.1.0
|
||||||
yamllint>=0.5.2
|
yamllint>=0.5.2
|
||||||
|
mock>=2.0 # BSD
|
||||||
|
|
64
tox.ini
64
tox.ini
|
@ -1,11 +1,8 @@
|
||||||
[tox]
|
[tox]
|
||||||
|
envlist = linters
|
||||||
minversion = 2.3
|
minversion = 2.3
|
||||||
envlist = py27,pep8
|
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[dcclient]
|
|
||||||
client_base_dir = .
|
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
install_command = pip install \
|
install_command = pip install \
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
|
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
|
||||||
|
@ -15,61 +12,36 @@ setenv =
|
||||||
OS_STDOUT_CAPTURE=1
|
OS_STDOUT_CAPTURE=1
|
||||||
OS_STDERR_CAPTURE=1
|
OS_STDERR_CAPTURE=1
|
||||||
OS_TEST_TIMEOUT=60
|
OS_TEST_TIMEOUT=60
|
||||||
# DISCOVER_DIRECTORY=dcmanagerclient/tests
|
CURRENT_CFG_FILE={toxinidir}/.current.cfg
|
||||||
|
commands = find {toxinidir} -type f -not -path '{toxinidir}/.tox/*' -not -path '*/__pycache__/*' -name '*.py[c|o]' -delete
|
||||||
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
|
keyring
|
||||||
|
|
||||||
whitelist_externals =
|
whitelist_externals =
|
||||||
rm
|
rm
|
||||||
find
|
find
|
||||||
reno
|
reno
|
||||||
|
|
||||||
[testenv:py27]
|
|
||||||
basepython = python2.7
|
|
||||||
commands =
|
|
||||||
find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete
|
|
||||||
stestr --test-path={[dcclient]client_base_dir}/dcmanagerclient/tests run '{posargs}'
|
|
||||||
|
|
||||||
[testenv:pep8]
|
|
||||||
basepython = python3
|
|
||||||
commands = flake8 {posargs}
|
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:flake8]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
setenv =
|
description = Dummy environment to allow flake8 to be run in subdir tox
|
||||||
PYTHON=coverage run --parallel-mode
|
|
||||||
PYTHONDONTWRITEBYTECODE=True
|
|
||||||
|
|
||||||
deps = {[testenv]deps}
|
[testenv:pep8]
|
||||||
coverage
|
|
||||||
|
|
||||||
commands =
|
|
||||||
find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete
|
|
||||||
coverage erase
|
|
||||||
stestr --test-path={[dcclient]client_base_dir}/dcmanagerclient/tests run '{posargs}'
|
|
||||||
coverage combine
|
|
||||||
coverage report
|
|
||||||
|
|
||||||
[testenv:debug]
|
|
||||||
basepython = python3
|
basepython = python3
|
||||||
commands = oslo_debug_helper {posargs}
|
description = Dummy environment to allow pep8 to be run in subdir tox
|
||||||
|
|
||||||
[flake8]
|
[testenv:pylint]
|
||||||
# E123, E125 skipped as they are invalid PEP-8.
|
basepython = python3
|
||||||
show-source = True
|
description = Dummy environment to allow pylint to be run in subdir tox
|
||||||
ignore = E123,E125,H102
|
|
||||||
builtins = _
|
|
||||||
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*openstack/common*,*egg,build
|
|
||||||
|
|
||||||
[testenv:linters]
|
[testenv:linters]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
# bashate ignore:
|
|
||||||
# E006 - accept long lines
|
|
||||||
# E040 - false positive on |& syntax (new in bash 4)
|
|
||||||
whitelist_externals = bash
|
whitelist_externals = bash
|
||||||
commands =
|
commands =
|
||||||
bash -c "find {toxinidir} \
|
bash -c "find {toxinidir} \
|
||||||
|
@ -100,4 +72,14 @@ basepython = python3
|
||||||
# Re-use the releasenotes venv
|
# Re-use the releasenotes venv
|
||||||
envdir = {toxworkdir}/releasenotes
|
envdir = {toxworkdir}/releasenotes
|
||||||
deps = -r{toxinidir}/doc/requirements.txt
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
commands = reno new {posargs}
|
commands = reno --rel-notes-dir {toxinidir}/releasenotes new {posargs}
|
||||||
|
|
||||||
|
[testenv:api-ref]
|
||||||
|
basepython = python3
|
||||||
|
deps =
|
||||||
|
-r{toxinidir}/doc/requirements.txt
|
||||||
|
commands =
|
||||||
|
rm -rf api-ref/build
|
||||||
|
sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
|
||||||
|
whitelist_externals = rm
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue