From 7b85032544b4ad638ec8b06f659f75ca41d5c908 Mon Sep 17 00:00:00 2001 From: Xav Paice Date: Wed, 5 Aug 2020 15:23:24 +1200 Subject: [PATCH] move charm source to src --- LICENSE => src/LICENSE | 0 README.md => src/README.md | 0 actions.yaml => src/actions.yaml | 0 {actions => src/actions}/apply-changes | 0 {actions => src/actions}/apply_changes.py | 0 config.yaml => src/config.yaml | 0 example_config.yaml => src/example_config.yaml | 0 icon.svg => src/icon.svg | 0 layer.yaml => src/layer.yaml | 0 {lib => src/lib}/advanced_routing_helper.py | 0 {lib => src/lib}/routing_entry.py | 0 {lib => src/lib}/routing_validator.py | 0 metadata.yaml => src/metadata.yaml | 0 {reactive => src/reactive}/advanced_routing.py | 0 requirements.txt => src/requirements.txt | 0 revision => src/revision | 0 {tests => src/tests}/functional/cfg_opts.py | 0 {tests => src/tests}/functional/conftest.py | 0 {tests => src/tests}/functional/juju_tools.py | 0 {tests => src/tests}/functional/requirements.txt | 0 {tests => src/tests}/functional/test_routing.py | 0 {tests => src/tests}/unit/conftest.py | 0 {tests => src/tests}/unit/requirements.txt | 0 {tests => src/tests}/unit/test_AdvancedRoutingHelper.py | 0 {tests => src/tests}/unit/test_RoutingEntryRule.py | 0 {tests => src/tests}/unit/test_actions.py | 4 ++-- tox.ini => src/tox.ini | 4 ++-- wheelhouse.txt => src/wheelhouse.txt | 0 28 files changed, 4 insertions(+), 4 deletions(-) rename LICENSE => src/LICENSE (100%) rename README.md => src/README.md (100%) rename actions.yaml => src/actions.yaml (100%) rename {actions => src/actions}/apply-changes (100%) rename {actions => src/actions}/apply_changes.py (100%) rename config.yaml => src/config.yaml (100%) rename example_config.yaml => src/example_config.yaml (100%) rename icon.svg => src/icon.svg (100%) rename layer.yaml => src/layer.yaml (100%) rename {lib => src/lib}/advanced_routing_helper.py (100%) rename {lib => src/lib}/routing_entry.py (100%) rename {lib => src/lib}/routing_validator.py (100%) rename metadata.yaml => src/metadata.yaml (100%) rename {reactive => src/reactive}/advanced_routing.py (100%) rename requirements.txt => src/requirements.txt (100%) rename revision => src/revision (100%) rename {tests => src/tests}/functional/cfg_opts.py (100%) rename {tests => src/tests}/functional/conftest.py (100%) rename {tests => src/tests}/functional/juju_tools.py (100%) rename {tests => src/tests}/functional/requirements.txt (100%) rename {tests => src/tests}/functional/test_routing.py (100%) rename {tests => src/tests}/unit/conftest.py (100%) rename {tests => src/tests}/unit/requirements.txt (100%) rename {tests => src/tests}/unit/test_AdvancedRoutingHelper.py (100%) rename {tests => src/tests}/unit/test_RoutingEntryRule.py (100%) rename {tests => src/tests}/unit/test_actions.py (90%) rename tox.ini => src/tox.ini (90%) rename wheelhouse.txt => src/wheelhouse.txt (100%) diff --git a/LICENSE b/src/LICENSE similarity index 100% rename from LICENSE rename to src/LICENSE diff --git a/README.md b/src/README.md similarity index 100% rename from README.md rename to src/README.md diff --git a/actions.yaml b/src/actions.yaml similarity index 100% rename from actions.yaml rename to src/actions.yaml diff --git a/actions/apply-changes b/src/actions/apply-changes similarity index 100% rename from actions/apply-changes rename to src/actions/apply-changes diff --git a/actions/apply_changes.py b/src/actions/apply_changes.py similarity index 100% rename from actions/apply_changes.py rename to src/actions/apply_changes.py diff --git a/config.yaml b/src/config.yaml similarity index 100% rename from config.yaml rename to src/config.yaml diff --git a/example_config.yaml b/src/example_config.yaml similarity index 100% rename from example_config.yaml rename to src/example_config.yaml diff --git a/icon.svg b/src/icon.svg similarity index 100% rename from icon.svg rename to src/icon.svg diff --git a/layer.yaml b/src/layer.yaml similarity index 100% rename from layer.yaml rename to src/layer.yaml diff --git a/lib/advanced_routing_helper.py b/src/lib/advanced_routing_helper.py similarity index 100% rename from lib/advanced_routing_helper.py rename to src/lib/advanced_routing_helper.py diff --git a/lib/routing_entry.py b/src/lib/routing_entry.py similarity index 100% rename from lib/routing_entry.py rename to src/lib/routing_entry.py diff --git a/lib/routing_validator.py b/src/lib/routing_validator.py similarity index 100% rename from lib/routing_validator.py rename to src/lib/routing_validator.py diff --git a/metadata.yaml b/src/metadata.yaml similarity index 100% rename from metadata.yaml rename to src/metadata.yaml diff --git a/reactive/advanced_routing.py b/src/reactive/advanced_routing.py similarity index 100% rename from reactive/advanced_routing.py rename to src/reactive/advanced_routing.py diff --git a/requirements.txt b/src/requirements.txt similarity index 100% rename from requirements.txt rename to src/requirements.txt diff --git a/revision b/src/revision similarity index 100% rename from revision rename to src/revision diff --git a/tests/functional/cfg_opts.py b/src/tests/functional/cfg_opts.py similarity index 100% rename from tests/functional/cfg_opts.py rename to src/tests/functional/cfg_opts.py diff --git a/tests/functional/conftest.py b/src/tests/functional/conftest.py similarity index 100% rename from tests/functional/conftest.py rename to src/tests/functional/conftest.py diff --git a/tests/functional/juju_tools.py b/src/tests/functional/juju_tools.py similarity index 100% rename from tests/functional/juju_tools.py rename to src/tests/functional/juju_tools.py diff --git a/tests/functional/requirements.txt b/src/tests/functional/requirements.txt similarity index 100% rename from tests/functional/requirements.txt rename to src/tests/functional/requirements.txt diff --git a/tests/functional/test_routing.py b/src/tests/functional/test_routing.py similarity index 100% rename from tests/functional/test_routing.py rename to src/tests/functional/test_routing.py diff --git a/tests/unit/conftest.py b/src/tests/unit/conftest.py similarity index 100% rename from tests/unit/conftest.py rename to src/tests/unit/conftest.py diff --git a/tests/unit/requirements.txt b/src/tests/unit/requirements.txt similarity index 100% rename from tests/unit/requirements.txt rename to src/tests/unit/requirements.txt diff --git a/tests/unit/test_AdvancedRoutingHelper.py b/src/tests/unit/test_AdvancedRoutingHelper.py similarity index 100% rename from tests/unit/test_AdvancedRoutingHelper.py rename to src/tests/unit/test_AdvancedRoutingHelper.py diff --git a/tests/unit/test_RoutingEntryRule.py b/src/tests/unit/test_RoutingEntryRule.py similarity index 100% rename from tests/unit/test_RoutingEntryRule.py rename to src/tests/unit/test_RoutingEntryRule.py diff --git a/tests/unit/test_actions.py b/src/tests/unit/test_actions.py similarity index 90% rename from tests/unit/test_actions.py rename to src/tests/unit/test_actions.py index 15de32b..1a97c04 100644 --- a/tests/unit/test_actions.py +++ b/src/tests/unit/test_actions.py @@ -13,7 +13,7 @@ class TestActions(): def test_action_apply_changes_apply_config(self, advanced_routing_helper): """Test action apply changes.""" - import apply_changes + import actions.apply_changes def noop(): pass @@ -27,4 +27,4 @@ def noop(): routing_validator.RoutingConfigValidator.__init__ = mock.Mock(return_value=None) test_obj.setup() - assert apply_changes.apply_config() + assert actions.apply_changes.apply_config() diff --git a/tox.ini b/src/tox.ini similarity index 90% rename from tox.ini rename to src/tox.ini index 2900ead..b5c8618 100644 --- a/tox.ini +++ b/src/tox.ini @@ -25,7 +25,7 @@ passenv = [testenv:lint] commands = flake8 - black --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" . +# TODO black --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" . deps = black flake8 @@ -42,7 +42,7 @@ exclude = charmhelpers, mod, .build - +ignore = D401,E501,W503 # TODO max-line-length = 88 max-complexity = 10 diff --git a/wheelhouse.txt b/src/wheelhouse.txt similarity index 100% rename from wheelhouse.txt rename to src/wheelhouse.txt