From 4e006a92a55a59c43cc7cca74f5cb9c1203705ed Mon Sep 17 00:00:00 2001 From: Don Penney Date: Mon, 4 Nov 2019 14:14:38 -0500 Subject: [PATCH] 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 --- .zuul.yaml | 28 ++++- .../.coveragerc | 0 .../.testr.conf | 0 .../MANIFEST.in | 0 .../README.rst | 0 .../babel.cfg | 0 .../dcmanagerclient}/__init__.py | 0 .../dcmanagerclient}/api/__init__.py | 0 .../dcmanagerclient}/api/base.py | 0 .../dcmanagerclient}/api/client.py | 0 .../dcmanagerclient}/api/httpclient.py | 0 .../dcmanagerclient}/api/v1/__init__.py | 0 .../dcmanagerclient}/api/v1/alarm_manager.py | 0 .../dcmanagerclient}/api/v1/client.py | 0 .../api/v1/subcloud_manager.py | 0 .../api/v1/sw_update_manager.py | 0 .../api/v1/sw_update_options_manager.py | 0 .../dcmanagerclient}/commands/README.rst | 0 .../dcmanagerclient}/commands/__init__.py | 0 .../dcmanagerclient}/commands/v1/__init__.py | 0 .../commands/v1/alarm_manager.py | 0 .../dcmanagerclient}/commands/v1/base.py | 0 .../commands/v1/subcloud_manager.py | 0 .../commands/v1/sw_update_manager.py | 0 .../commands/v1/sw_update_options_manager.py | 0 .../dcmanagerclient}/exceptions.py | 0 .../dcmanagerclient}/openstack/__init__.py | 0 .../openstack/common/__init__.py | 0 .../openstack/common/apiclient/__init__.py | 0 .../openstack/common/apiclient/auth.py | 0 .../openstack/common/apiclient/base.py | 0 .../openstack/common/apiclient/client.py | 0 .../openstack/common/apiclient/exceptions.py | 0 .../openstack/common/apiclient/fake_client.py | 0 .../openstack/common/cliutils.py | 0 .../openstack/common/gettextutils.py | 0 .../openstack/common/importutils.py | 0 .../openstack/common/strutils.py | 0 .../openstack/common/uuidutils.py | 0 .../dcmanagerclient}/osc/plugin.py | 0 .../dcmanagerclient}/shell.py | 0 .../dcmanagerclient}/tests/__init__.py | 0 .../dcmanagerclient}/tests/base.py | 0 .../dcmanagerclient}/tests/base_shell_test.py | 0 .../dcmanagerclient}/tests/test_client.py | 0 .../tests/test_help_and_bash_completion.py | 0 .../dcmanagerclient}/tests/test_httpclient.py | 0 .../dcmanagerclient}/tests/test_shell.py | 0 .../dcmanagerclient}/tests/test_utils.py | 0 .../dcmanagerclient}/tests/v1/__init__.py | 0 .../tests/v1/test_subcloud_manager.py | 0 .../dcmanagerclient}/utils.py | 0 distributedcloud-client/requirements.txt | 12 ++ .../setup.cfg | 0 setup.py => distributedcloud-client/setup.py | 0 distributedcloud-client/test-requirements.txt | 16 +++ distributedcloud-client/tox.ini | 103 ++++++++++++++++++ requirements.txt | 14 +-- test-requirements.txt | 15 +-- tox.ini | 64 ++++------- 60 files changed, 181 insertions(+), 71 deletions(-) rename .coveragerc => distributedcloud-client/.coveragerc (100%) rename .testr.conf => distributedcloud-client/.testr.conf (100%) rename MANIFEST.in => distributedcloud-client/MANIFEST.in (100%) rename README.rst => distributedcloud-client/README.rst (100%) rename babel.cfg => distributedcloud-client/babel.cfg (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/__init__.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/api/__init__.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/api/base.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/api/client.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/api/httpclient.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/api/v1/__init__.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/api/v1/alarm_manager.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/api/v1/client.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/api/v1/subcloud_manager.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/api/v1/sw_update_manager.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/api/v1/sw_update_options_manager.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/commands/README.rst (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/commands/__init__.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/commands/v1/__init__.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/commands/v1/alarm_manager.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/commands/v1/base.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/commands/v1/subcloud_manager.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/commands/v1/sw_update_manager.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/commands/v1/sw_update_options_manager.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/exceptions.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/openstack/__init__.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/openstack/common/__init__.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/openstack/common/apiclient/__init__.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/openstack/common/apiclient/auth.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/openstack/common/apiclient/base.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/openstack/common/apiclient/client.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/openstack/common/apiclient/exceptions.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/openstack/common/apiclient/fake_client.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/openstack/common/cliutils.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/openstack/common/gettextutils.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/openstack/common/importutils.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/openstack/common/strutils.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/openstack/common/uuidutils.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/osc/plugin.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/shell.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/tests/__init__.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/tests/base.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/tests/base_shell_test.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/tests/test_client.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/tests/test_help_and_bash_completion.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/tests/test_httpclient.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/tests/test_shell.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/tests/test_utils.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/tests/v1/__init__.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/tests/v1/test_subcloud_manager.py (100%) rename {dcmanagerclient => distributedcloud-client/dcmanagerclient}/utils.py (100%) create mode 100644 distributedcloud-client/requirements.txt rename setup.cfg => distributedcloud-client/setup.cfg (100%) rename setup.py => distributedcloud-client/setup.py (100%) create mode 100644 distributedcloud-client/test-requirements.txt create mode 100644 distributedcloud-client/tox.ini diff --git a/.zuul.yaml b/.zuul.yaml index 6f9c0a9..bb90c9c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -6,10 +6,30 @@ check: jobs: - openstack-tox-linters - - openstack-tox-pep8 - - openstack-tox-py27 + - stx-distcloud-client-tox-pep8: + voting: false + - stx-distcloud-client-tox-py27: + voting: false gate: jobs: - openstack-tox-linters - - openstack-tox-pep8 - - openstack-tox-py27 + - stx-distcloud-client-tox-pep8: + 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 diff --git a/.coveragerc b/distributedcloud-client/.coveragerc similarity index 100% rename from .coveragerc rename to distributedcloud-client/.coveragerc diff --git a/.testr.conf b/distributedcloud-client/.testr.conf similarity index 100% rename from .testr.conf rename to distributedcloud-client/.testr.conf diff --git a/MANIFEST.in b/distributedcloud-client/MANIFEST.in similarity index 100% rename from MANIFEST.in rename to distributedcloud-client/MANIFEST.in diff --git a/README.rst b/distributedcloud-client/README.rst similarity index 100% rename from README.rst rename to distributedcloud-client/README.rst diff --git a/babel.cfg b/distributedcloud-client/babel.cfg similarity index 100% rename from babel.cfg rename to distributedcloud-client/babel.cfg diff --git a/dcmanagerclient/__init__.py b/distributedcloud-client/dcmanagerclient/__init__.py similarity index 100% rename from dcmanagerclient/__init__.py rename to distributedcloud-client/dcmanagerclient/__init__.py diff --git a/dcmanagerclient/api/__init__.py b/distributedcloud-client/dcmanagerclient/api/__init__.py similarity index 100% rename from dcmanagerclient/api/__init__.py rename to distributedcloud-client/dcmanagerclient/api/__init__.py diff --git a/dcmanagerclient/api/base.py b/distributedcloud-client/dcmanagerclient/api/base.py similarity index 100% rename from dcmanagerclient/api/base.py rename to distributedcloud-client/dcmanagerclient/api/base.py diff --git a/dcmanagerclient/api/client.py b/distributedcloud-client/dcmanagerclient/api/client.py similarity index 100% rename from dcmanagerclient/api/client.py rename to distributedcloud-client/dcmanagerclient/api/client.py diff --git a/dcmanagerclient/api/httpclient.py b/distributedcloud-client/dcmanagerclient/api/httpclient.py similarity index 100% rename from dcmanagerclient/api/httpclient.py rename to distributedcloud-client/dcmanagerclient/api/httpclient.py diff --git a/dcmanagerclient/api/v1/__init__.py b/distributedcloud-client/dcmanagerclient/api/v1/__init__.py similarity index 100% rename from dcmanagerclient/api/v1/__init__.py rename to distributedcloud-client/dcmanagerclient/api/v1/__init__.py diff --git a/dcmanagerclient/api/v1/alarm_manager.py b/distributedcloud-client/dcmanagerclient/api/v1/alarm_manager.py similarity index 100% rename from dcmanagerclient/api/v1/alarm_manager.py rename to distributedcloud-client/dcmanagerclient/api/v1/alarm_manager.py diff --git a/dcmanagerclient/api/v1/client.py b/distributedcloud-client/dcmanagerclient/api/v1/client.py similarity index 100% rename from dcmanagerclient/api/v1/client.py rename to distributedcloud-client/dcmanagerclient/api/v1/client.py diff --git a/dcmanagerclient/api/v1/subcloud_manager.py b/distributedcloud-client/dcmanagerclient/api/v1/subcloud_manager.py similarity index 100% rename from dcmanagerclient/api/v1/subcloud_manager.py rename to distributedcloud-client/dcmanagerclient/api/v1/subcloud_manager.py diff --git a/dcmanagerclient/api/v1/sw_update_manager.py b/distributedcloud-client/dcmanagerclient/api/v1/sw_update_manager.py similarity index 100% rename from dcmanagerclient/api/v1/sw_update_manager.py rename to distributedcloud-client/dcmanagerclient/api/v1/sw_update_manager.py diff --git a/dcmanagerclient/api/v1/sw_update_options_manager.py b/distributedcloud-client/dcmanagerclient/api/v1/sw_update_options_manager.py similarity index 100% rename from dcmanagerclient/api/v1/sw_update_options_manager.py rename to distributedcloud-client/dcmanagerclient/api/v1/sw_update_options_manager.py diff --git a/dcmanagerclient/commands/README.rst b/distributedcloud-client/dcmanagerclient/commands/README.rst similarity index 100% rename from dcmanagerclient/commands/README.rst rename to distributedcloud-client/dcmanagerclient/commands/README.rst diff --git a/dcmanagerclient/commands/__init__.py b/distributedcloud-client/dcmanagerclient/commands/__init__.py similarity index 100% rename from dcmanagerclient/commands/__init__.py rename to distributedcloud-client/dcmanagerclient/commands/__init__.py diff --git a/dcmanagerclient/commands/v1/__init__.py b/distributedcloud-client/dcmanagerclient/commands/v1/__init__.py similarity index 100% rename from dcmanagerclient/commands/v1/__init__.py rename to distributedcloud-client/dcmanagerclient/commands/v1/__init__.py diff --git a/dcmanagerclient/commands/v1/alarm_manager.py b/distributedcloud-client/dcmanagerclient/commands/v1/alarm_manager.py similarity index 100% rename from dcmanagerclient/commands/v1/alarm_manager.py rename to distributedcloud-client/dcmanagerclient/commands/v1/alarm_manager.py diff --git a/dcmanagerclient/commands/v1/base.py b/distributedcloud-client/dcmanagerclient/commands/v1/base.py similarity index 100% rename from dcmanagerclient/commands/v1/base.py rename to distributedcloud-client/dcmanagerclient/commands/v1/base.py diff --git a/dcmanagerclient/commands/v1/subcloud_manager.py b/distributedcloud-client/dcmanagerclient/commands/v1/subcloud_manager.py similarity index 100% rename from dcmanagerclient/commands/v1/subcloud_manager.py rename to distributedcloud-client/dcmanagerclient/commands/v1/subcloud_manager.py diff --git a/dcmanagerclient/commands/v1/sw_update_manager.py b/distributedcloud-client/dcmanagerclient/commands/v1/sw_update_manager.py similarity index 100% rename from dcmanagerclient/commands/v1/sw_update_manager.py rename to distributedcloud-client/dcmanagerclient/commands/v1/sw_update_manager.py diff --git a/dcmanagerclient/commands/v1/sw_update_options_manager.py b/distributedcloud-client/dcmanagerclient/commands/v1/sw_update_options_manager.py similarity index 100% rename from dcmanagerclient/commands/v1/sw_update_options_manager.py rename to distributedcloud-client/dcmanagerclient/commands/v1/sw_update_options_manager.py diff --git a/dcmanagerclient/exceptions.py b/distributedcloud-client/dcmanagerclient/exceptions.py similarity index 100% rename from dcmanagerclient/exceptions.py rename to distributedcloud-client/dcmanagerclient/exceptions.py diff --git a/dcmanagerclient/openstack/__init__.py b/distributedcloud-client/dcmanagerclient/openstack/__init__.py similarity index 100% rename from dcmanagerclient/openstack/__init__.py rename to distributedcloud-client/dcmanagerclient/openstack/__init__.py diff --git a/dcmanagerclient/openstack/common/__init__.py b/distributedcloud-client/dcmanagerclient/openstack/common/__init__.py similarity index 100% rename from dcmanagerclient/openstack/common/__init__.py rename to distributedcloud-client/dcmanagerclient/openstack/common/__init__.py diff --git a/dcmanagerclient/openstack/common/apiclient/__init__.py b/distributedcloud-client/dcmanagerclient/openstack/common/apiclient/__init__.py similarity index 100% rename from dcmanagerclient/openstack/common/apiclient/__init__.py rename to distributedcloud-client/dcmanagerclient/openstack/common/apiclient/__init__.py diff --git a/dcmanagerclient/openstack/common/apiclient/auth.py b/distributedcloud-client/dcmanagerclient/openstack/common/apiclient/auth.py similarity index 100% rename from dcmanagerclient/openstack/common/apiclient/auth.py rename to distributedcloud-client/dcmanagerclient/openstack/common/apiclient/auth.py diff --git a/dcmanagerclient/openstack/common/apiclient/base.py b/distributedcloud-client/dcmanagerclient/openstack/common/apiclient/base.py similarity index 100% rename from dcmanagerclient/openstack/common/apiclient/base.py rename to distributedcloud-client/dcmanagerclient/openstack/common/apiclient/base.py diff --git a/dcmanagerclient/openstack/common/apiclient/client.py b/distributedcloud-client/dcmanagerclient/openstack/common/apiclient/client.py similarity index 100% rename from dcmanagerclient/openstack/common/apiclient/client.py rename to distributedcloud-client/dcmanagerclient/openstack/common/apiclient/client.py diff --git a/dcmanagerclient/openstack/common/apiclient/exceptions.py b/distributedcloud-client/dcmanagerclient/openstack/common/apiclient/exceptions.py similarity index 100% rename from dcmanagerclient/openstack/common/apiclient/exceptions.py rename to distributedcloud-client/dcmanagerclient/openstack/common/apiclient/exceptions.py diff --git a/dcmanagerclient/openstack/common/apiclient/fake_client.py b/distributedcloud-client/dcmanagerclient/openstack/common/apiclient/fake_client.py similarity index 100% rename from dcmanagerclient/openstack/common/apiclient/fake_client.py rename to distributedcloud-client/dcmanagerclient/openstack/common/apiclient/fake_client.py diff --git a/dcmanagerclient/openstack/common/cliutils.py b/distributedcloud-client/dcmanagerclient/openstack/common/cliutils.py similarity index 100% rename from dcmanagerclient/openstack/common/cliutils.py rename to distributedcloud-client/dcmanagerclient/openstack/common/cliutils.py diff --git a/dcmanagerclient/openstack/common/gettextutils.py b/distributedcloud-client/dcmanagerclient/openstack/common/gettextutils.py similarity index 100% rename from dcmanagerclient/openstack/common/gettextutils.py rename to distributedcloud-client/dcmanagerclient/openstack/common/gettextutils.py diff --git a/dcmanagerclient/openstack/common/importutils.py b/distributedcloud-client/dcmanagerclient/openstack/common/importutils.py similarity index 100% rename from dcmanagerclient/openstack/common/importutils.py rename to distributedcloud-client/dcmanagerclient/openstack/common/importutils.py diff --git a/dcmanagerclient/openstack/common/strutils.py b/distributedcloud-client/dcmanagerclient/openstack/common/strutils.py similarity index 100% rename from dcmanagerclient/openstack/common/strutils.py rename to distributedcloud-client/dcmanagerclient/openstack/common/strutils.py diff --git a/dcmanagerclient/openstack/common/uuidutils.py b/distributedcloud-client/dcmanagerclient/openstack/common/uuidutils.py similarity index 100% rename from dcmanagerclient/openstack/common/uuidutils.py rename to distributedcloud-client/dcmanagerclient/openstack/common/uuidutils.py diff --git a/dcmanagerclient/osc/plugin.py b/distributedcloud-client/dcmanagerclient/osc/plugin.py similarity index 100% rename from dcmanagerclient/osc/plugin.py rename to distributedcloud-client/dcmanagerclient/osc/plugin.py diff --git a/dcmanagerclient/shell.py b/distributedcloud-client/dcmanagerclient/shell.py similarity index 100% rename from dcmanagerclient/shell.py rename to distributedcloud-client/dcmanagerclient/shell.py diff --git a/dcmanagerclient/tests/__init__.py b/distributedcloud-client/dcmanagerclient/tests/__init__.py similarity index 100% rename from dcmanagerclient/tests/__init__.py rename to distributedcloud-client/dcmanagerclient/tests/__init__.py diff --git a/dcmanagerclient/tests/base.py b/distributedcloud-client/dcmanagerclient/tests/base.py similarity index 100% rename from dcmanagerclient/tests/base.py rename to distributedcloud-client/dcmanagerclient/tests/base.py diff --git a/dcmanagerclient/tests/base_shell_test.py b/distributedcloud-client/dcmanagerclient/tests/base_shell_test.py similarity index 100% rename from dcmanagerclient/tests/base_shell_test.py rename to distributedcloud-client/dcmanagerclient/tests/base_shell_test.py diff --git a/dcmanagerclient/tests/test_client.py b/distributedcloud-client/dcmanagerclient/tests/test_client.py similarity index 100% rename from dcmanagerclient/tests/test_client.py rename to distributedcloud-client/dcmanagerclient/tests/test_client.py diff --git a/dcmanagerclient/tests/test_help_and_bash_completion.py b/distributedcloud-client/dcmanagerclient/tests/test_help_and_bash_completion.py similarity index 100% rename from dcmanagerclient/tests/test_help_and_bash_completion.py rename to distributedcloud-client/dcmanagerclient/tests/test_help_and_bash_completion.py diff --git a/dcmanagerclient/tests/test_httpclient.py b/distributedcloud-client/dcmanagerclient/tests/test_httpclient.py similarity index 100% rename from dcmanagerclient/tests/test_httpclient.py rename to distributedcloud-client/dcmanagerclient/tests/test_httpclient.py diff --git a/dcmanagerclient/tests/test_shell.py b/distributedcloud-client/dcmanagerclient/tests/test_shell.py similarity index 100% rename from dcmanagerclient/tests/test_shell.py rename to distributedcloud-client/dcmanagerclient/tests/test_shell.py diff --git a/dcmanagerclient/tests/test_utils.py b/distributedcloud-client/dcmanagerclient/tests/test_utils.py similarity index 100% rename from dcmanagerclient/tests/test_utils.py rename to distributedcloud-client/dcmanagerclient/tests/test_utils.py diff --git a/dcmanagerclient/tests/v1/__init__.py b/distributedcloud-client/dcmanagerclient/tests/v1/__init__.py similarity index 100% rename from dcmanagerclient/tests/v1/__init__.py rename to distributedcloud-client/dcmanagerclient/tests/v1/__init__.py diff --git a/dcmanagerclient/tests/v1/test_subcloud_manager.py b/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_manager.py similarity index 100% rename from dcmanagerclient/tests/v1/test_subcloud_manager.py rename to distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_manager.py diff --git a/dcmanagerclient/utils.py b/distributedcloud-client/dcmanagerclient/utils.py similarity index 100% rename from dcmanagerclient/utils.py rename to distributedcloud-client/dcmanagerclient/utils.py diff --git a/distributedcloud-client/requirements.txt b/distributedcloud-client/requirements.txt new file mode 100644 index 0000000..b6e9014 --- /dev/null +++ b/distributedcloud-client/requirements.txt @@ -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 diff --git a/setup.cfg b/distributedcloud-client/setup.cfg similarity index 100% rename from setup.cfg rename to distributedcloud-client/setup.cfg diff --git a/setup.py b/distributedcloud-client/setup.py similarity index 100% rename from setup.py rename to distributedcloud-client/setup.py diff --git a/distributedcloud-client/test-requirements.txt b/distributedcloud-client/test-requirements.txt new file mode 100644 index 0000000..f2d1a07 --- /dev/null +++ b/distributedcloud-client/test-requirements.txt @@ -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 diff --git a/distributedcloud-client/tox.ini b/distributedcloud-client/tox.ini new file mode 100644 index 0000000..72ad4c0 --- /dev/null +++ b/distributedcloud-client/tox.ini @@ -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} diff --git a/requirements.txt b/requirements.txt index b6e9014..e47d169 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,2 @@ -# 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 +SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT +stevedore>=1.20.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index f2d1a07..184eec9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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 yamllint>=0.5.2 +mock>=2.0 # BSD diff --git a/tox.ini b/tox.ini index 72ad4c0..34bb8e7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,8 @@ [tox] +envlist = linters 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} \ @@ -15,61 +12,36 @@ setenv = OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 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 -r{toxinidir}/requirements.txt + keyring + 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] +[testenv:flake8] basepython = python3 -setenv = - PYTHON=coverage run --parallel-mode - PYTHONDONTWRITEBYTECODE=True +description = Dummy environment to allow flake8 to be run in subdir tox -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] +[testenv:pep8] basepython = python3 -commands = oslo_debug_helper {posargs} +description = Dummy environment to allow pep8 to be run in subdir tox -[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:pylint] +basepython = python3 +description = Dummy environment to allow pylint to be run in subdir tox [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} \ @@ -100,4 +72,14 @@ basepython = python3 # Re-use the releasenotes venv envdir = {toxworkdir}/releasenotes 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 +