From: Aleš Mrázek Date: Tue, 6 Aug 2024 09:07:53 +0000 (+0200) Subject: manager: moved everything out of the directory X-Git-Tag: v6.0.9~18^2~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=414e174505149a9e7731fa0fd7b3911158bff60f;p=thirdparty%2Fknot-resolver.git manager: moved everything out of the directory --- diff --git a/manager/.gitlab-ci.yml b/.gitlab-ci.manager.yml similarity index 88% rename from manager/.gitlab-ci.yml rename to .gitlab-ci.manager.yml index 369035c8b..cc94c0bf3 100644 --- a/manager/.gitlab-ci.yml +++ b/.gitlab-ci.manager.yml @@ -4,7 +4,6 @@ stages: default: image: $IMAGE_PREFIX/manager:$IMAGE_TAG before_script: - - cd manager - poetry --version - poetry env use $PYTHON_INTERPRETER tags: @@ -36,15 +35,15 @@ lint:py3.12: - mkdir -p /var/cache/knot-resolver - poe test # the following command makes sure that the source root of the coverage file is at $gitroot - - poetry run bash -c "cd ..; coverage combine manager/.coverage; coverage xml" + - poetry run bash -c "coverage combine .coverage; coverage xml" artifacts: reports: coverage_report: coverage_format: cobertura path: coverage.xml - junit: manager/unit.junit.xml + junit: unit.junit.xml paths: - - manager/unit.junit.xml + - unit.junit.xml unit:py3.8: <<: *unit diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e34ba7e09..12222fe26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -381,7 +381,7 @@ manager: stage: test needs: [] trigger: - include: manager/.gitlab-ci.yml + include: .gitlab-ci.manager.yml strategy: depend except: refs: diff --git a/manager/ARCHITECTURE.md b/ARCHITECTURE.md similarity index 100% rename from manager/ARCHITECTURE.md rename to ARCHITECTURE.md diff --git a/manager/ERROR_HANDLING.md b/ERROR_HANDLING.md similarity index 100% rename from manager/ERROR_HANDLING.md rename to ERROR_HANDLING.md diff --git a/build_c_extensions.py b/build_c_extensions.py index 40d281f5a..ad63013a3 100644 --- a/build_c_extensions.py +++ b/build_c_extensions.py @@ -9,7 +9,7 @@ def build(setup_kwargs: Dict[Any, Any]) -> None: "ext_modules": [ Extension( name="knot_resolver_manager.kresd_controller.supervisord.plugin.notify", - sources=["manager/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c"], + sources=["python/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c"], ), ] } diff --git a/pyproject.toml b/pyproject.toml index 2a4bedf26..013b300d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ repository = "https://gitlab.nic.cz/knot/knot-resolver" documentation = "https://www.knot-resolver.cz/documentation" packages = [ - {include = "knot_resolver_manager", from = "manager"} + {include = "knot_resolver_manager", from = "python"} ] # See currently open issue about building C extensions here: diff --git a/manager/knot_resolver_manager/__init__.py b/python/knot_resolver_manager/__init__.py similarity index 100% rename from manager/knot_resolver_manager/__init__.py rename to python/knot_resolver_manager/__init__.py diff --git a/manager/knot_resolver_manager/__main__.py b/python/knot_resolver_manager/__main__.py similarity index 100% rename from manager/knot_resolver_manager/__main__.py rename to python/knot_resolver_manager/__main__.py diff --git a/manager/knot_resolver_manager/cli/__init__.py b/python/knot_resolver_manager/cli/__init__.py similarity index 100% rename from manager/knot_resolver_manager/cli/__init__.py rename to python/knot_resolver_manager/cli/__init__.py diff --git a/manager/knot_resolver_manager/cli/__main__.py b/python/knot_resolver_manager/cli/__main__.py similarity index 100% rename from manager/knot_resolver_manager/cli/__main__.py rename to python/knot_resolver_manager/cli/__main__.py diff --git a/manager/knot_resolver_manager/cli/cmd/cache.py b/python/knot_resolver_manager/cli/cmd/cache.py similarity index 100% rename from manager/knot_resolver_manager/cli/cmd/cache.py rename to python/knot_resolver_manager/cli/cmd/cache.py diff --git a/manager/knot_resolver_manager/cli/cmd/completion.py b/python/knot_resolver_manager/cli/cmd/completion.py similarity index 100% rename from manager/knot_resolver_manager/cli/cmd/completion.py rename to python/knot_resolver_manager/cli/cmd/completion.py diff --git a/manager/knot_resolver_manager/cli/cmd/config.py b/python/knot_resolver_manager/cli/cmd/config.py similarity index 100% rename from manager/knot_resolver_manager/cli/cmd/config.py rename to python/knot_resolver_manager/cli/cmd/config.py diff --git a/manager/knot_resolver_manager/cli/cmd/convert.py b/python/knot_resolver_manager/cli/cmd/convert.py similarity index 100% rename from manager/knot_resolver_manager/cli/cmd/convert.py rename to python/knot_resolver_manager/cli/cmd/convert.py diff --git a/manager/knot_resolver_manager/cli/cmd/help.py b/python/knot_resolver_manager/cli/cmd/help.py similarity index 100% rename from manager/knot_resolver_manager/cli/cmd/help.py rename to python/knot_resolver_manager/cli/cmd/help.py diff --git a/manager/knot_resolver_manager/cli/cmd/metrics.py b/python/knot_resolver_manager/cli/cmd/metrics.py similarity index 100% rename from manager/knot_resolver_manager/cli/cmd/metrics.py rename to python/knot_resolver_manager/cli/cmd/metrics.py diff --git a/manager/knot_resolver_manager/cli/cmd/reload.py b/python/knot_resolver_manager/cli/cmd/reload.py similarity index 100% rename from manager/knot_resolver_manager/cli/cmd/reload.py rename to python/knot_resolver_manager/cli/cmd/reload.py diff --git a/manager/knot_resolver_manager/cli/cmd/schema.py b/python/knot_resolver_manager/cli/cmd/schema.py similarity index 100% rename from manager/knot_resolver_manager/cli/cmd/schema.py rename to python/knot_resolver_manager/cli/cmd/schema.py diff --git a/manager/knot_resolver_manager/cli/cmd/stop.py b/python/knot_resolver_manager/cli/cmd/stop.py similarity index 100% rename from manager/knot_resolver_manager/cli/cmd/stop.py rename to python/knot_resolver_manager/cli/cmd/stop.py diff --git a/manager/knot_resolver_manager/cli/cmd/validate.py b/python/knot_resolver_manager/cli/cmd/validate.py similarity index 100% rename from manager/knot_resolver_manager/cli/cmd/validate.py rename to python/knot_resolver_manager/cli/cmd/validate.py diff --git a/manager/knot_resolver_manager/cli/command.py b/python/knot_resolver_manager/cli/command.py similarity index 100% rename from manager/knot_resolver_manager/cli/command.py rename to python/knot_resolver_manager/cli/command.py diff --git a/manager/knot_resolver_manager/cli/kresctl.py b/python/knot_resolver_manager/cli/kresctl.py similarity index 100% rename from manager/knot_resolver_manager/cli/kresctl.py rename to python/knot_resolver_manager/cli/kresctl.py diff --git a/manager/knot_resolver_manager/cli/main.py b/python/knot_resolver_manager/cli/main.py similarity index 100% rename from manager/knot_resolver_manager/cli/main.py rename to python/knot_resolver_manager/cli/main.py diff --git a/manager/knot_resolver_manager/compat/__init__.py b/python/knot_resolver_manager/compat/__init__.py similarity index 100% rename from manager/knot_resolver_manager/compat/__init__.py rename to python/knot_resolver_manager/compat/__init__.py diff --git a/manager/knot_resolver_manager/compat/asyncio.py b/python/knot_resolver_manager/compat/asyncio.py similarity index 100% rename from manager/knot_resolver_manager/compat/asyncio.py rename to python/knot_resolver_manager/compat/asyncio.py diff --git a/manager/knot_resolver_manager/config_store.py b/python/knot_resolver_manager/config_store.py similarity index 100% rename from manager/knot_resolver_manager/config_store.py rename to python/knot_resolver_manager/config_store.py diff --git a/manager/knot_resolver_manager/constants.py b/python/knot_resolver_manager/constants.py similarity index 100% rename from manager/knot_resolver_manager/constants.py rename to python/knot_resolver_manager/constants.py diff --git a/manager/knot_resolver_manager/datamodel/__init__.py b/python/knot_resolver_manager/datamodel/__init__.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/__init__.py rename to python/knot_resolver_manager/datamodel/__init__.py diff --git a/manager/knot_resolver_manager/datamodel/cache_schema.py b/python/knot_resolver_manager/datamodel/cache_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/cache_schema.py rename to python/knot_resolver_manager/datamodel/cache_schema.py diff --git a/manager/knot_resolver_manager/datamodel/config_schema.py b/python/knot_resolver_manager/datamodel/config_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/config_schema.py rename to python/knot_resolver_manager/datamodel/config_schema.py diff --git a/manager/knot_resolver_manager/datamodel/design-notes.yml b/python/knot_resolver_manager/datamodel/design-notes.yml similarity index 100% rename from manager/knot_resolver_manager/datamodel/design-notes.yml rename to python/knot_resolver_manager/datamodel/design-notes.yml diff --git a/manager/knot_resolver_manager/datamodel/dns64_schema.py b/python/knot_resolver_manager/datamodel/dns64_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/dns64_schema.py rename to python/knot_resolver_manager/datamodel/dns64_schema.py diff --git a/manager/knot_resolver_manager/datamodel/dnssec_schema.py b/python/knot_resolver_manager/datamodel/dnssec_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/dnssec_schema.py rename to python/knot_resolver_manager/datamodel/dnssec_schema.py diff --git a/manager/knot_resolver_manager/datamodel/forward_schema.py b/python/knot_resolver_manager/datamodel/forward_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/forward_schema.py rename to python/knot_resolver_manager/datamodel/forward_schema.py diff --git a/manager/knot_resolver_manager/datamodel/globals.py b/python/knot_resolver_manager/datamodel/globals.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/globals.py rename to python/knot_resolver_manager/datamodel/globals.py diff --git a/manager/knot_resolver_manager/datamodel/local_data_schema.py b/python/knot_resolver_manager/datamodel/local_data_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/local_data_schema.py rename to python/knot_resolver_manager/datamodel/local_data_schema.py diff --git a/manager/knot_resolver_manager/datamodel/logging_schema.py b/python/knot_resolver_manager/datamodel/logging_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/logging_schema.py rename to python/knot_resolver_manager/datamodel/logging_schema.py diff --git a/manager/knot_resolver_manager/datamodel/lua_schema.py b/python/knot_resolver_manager/datamodel/lua_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/lua_schema.py rename to python/knot_resolver_manager/datamodel/lua_schema.py diff --git a/manager/knot_resolver_manager/datamodel/management_schema.py b/python/knot_resolver_manager/datamodel/management_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/management_schema.py rename to python/knot_resolver_manager/datamodel/management_schema.py diff --git a/manager/knot_resolver_manager/datamodel/monitoring_schema.py b/python/knot_resolver_manager/datamodel/monitoring_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/monitoring_schema.py rename to python/knot_resolver_manager/datamodel/monitoring_schema.py diff --git a/manager/knot_resolver_manager/datamodel/network_schema.py b/python/knot_resolver_manager/datamodel/network_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/network_schema.py rename to python/knot_resolver_manager/datamodel/network_schema.py diff --git a/manager/knot_resolver_manager/datamodel/options_schema.py b/python/knot_resolver_manager/datamodel/options_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/options_schema.py rename to python/knot_resolver_manager/datamodel/options_schema.py diff --git a/manager/knot_resolver_manager/datamodel/policy_schema.py b/python/knot_resolver_manager/datamodel/policy_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/policy_schema.py rename to python/knot_resolver_manager/datamodel/policy_schema.py diff --git a/manager/knot_resolver_manager/datamodel/rpz_schema.py b/python/knot_resolver_manager/datamodel/rpz_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/rpz_schema.py rename to python/knot_resolver_manager/datamodel/rpz_schema.py diff --git a/manager/knot_resolver_manager/datamodel/slice_schema.py b/python/knot_resolver_manager/datamodel/slice_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/slice_schema.py rename to python/knot_resolver_manager/datamodel/slice_schema.py diff --git a/manager/knot_resolver_manager/datamodel/static_hints_schema.py b/python/knot_resolver_manager/datamodel/static_hints_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/static_hints_schema.py rename to python/knot_resolver_manager/datamodel/static_hints_schema.py diff --git a/manager/knot_resolver_manager/datamodel/stub_zone_schema.py b/python/knot_resolver_manager/datamodel/stub_zone_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/stub_zone_schema.py rename to python/knot_resolver_manager/datamodel/stub_zone_schema.py diff --git a/manager/knot_resolver_manager/datamodel/templates/__init__.py b/python/knot_resolver_manager/datamodel/templates/__init__.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/__init__.py rename to python/knot_resolver_manager/datamodel/templates/__init__.py diff --git a/manager/knot_resolver_manager/datamodel/templates/cache.lua.j2 b/python/knot_resolver_manager/datamodel/templates/cache.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/cache.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/cache.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/dns64.lua.j2 b/python/knot_resolver_manager/datamodel/templates/dns64.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/dns64.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/dns64.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/dnssec.lua.j2 b/python/knot_resolver_manager/datamodel/templates/dnssec.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/dnssec.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/dnssec.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/forward.lua.j2 b/python/knot_resolver_manager/datamodel/templates/forward.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/forward.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/forward.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/local_data.lua.j2 b/python/knot_resolver_manager/datamodel/templates/local_data.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/local_data.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/local_data.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/logging.lua.j2 b/python/knot_resolver_manager/datamodel/templates/logging.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/logging.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/logging.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2 b/python/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2 b/python/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2 b/python/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 b/python/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2 b/python/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 b/python/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2 b/python/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/monitoring.lua.j2 b/python/knot_resolver_manager/datamodel/templates/monitoring.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/monitoring.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/monitoring.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/network.lua.j2 b/python/knot_resolver_manager/datamodel/templates/network.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/network.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/network.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/options.lua.j2 b/python/knot_resolver_manager/datamodel/templates/options.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/options.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/options.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/policy-config.lua.j2 b/python/knot_resolver_manager/datamodel/templates/policy-config.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/policy-config.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/policy-config.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/static_hints.lua.j2 b/python/knot_resolver_manager/datamodel/templates/static_hints.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/static_hints.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/static_hints.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/views.lua.j2 b/python/knot_resolver_manager/datamodel/templates/views.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/views.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/views.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2 b/python/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/templates/worker-config.lua.j2 b/python/knot_resolver_manager/datamodel/templates/worker-config.lua.j2 similarity index 100% rename from manager/knot_resolver_manager/datamodel/templates/worker-config.lua.j2 rename to python/knot_resolver_manager/datamodel/templates/worker-config.lua.j2 diff --git a/manager/knot_resolver_manager/datamodel/types/__init__.py b/python/knot_resolver_manager/datamodel/types/__init__.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/types/__init__.py rename to python/knot_resolver_manager/datamodel/types/__init__.py diff --git a/manager/knot_resolver_manager/datamodel/types/base_types.py b/python/knot_resolver_manager/datamodel/types/base_types.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/types/base_types.py rename to python/knot_resolver_manager/datamodel/types/base_types.py diff --git a/manager/knot_resolver_manager/datamodel/types/enums.py b/python/knot_resolver_manager/datamodel/types/enums.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/types/enums.py rename to python/knot_resolver_manager/datamodel/types/enums.py diff --git a/manager/knot_resolver_manager/datamodel/types/files.py b/python/knot_resolver_manager/datamodel/types/files.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/types/files.py rename to python/knot_resolver_manager/datamodel/types/files.py diff --git a/manager/knot_resolver_manager/datamodel/types/generic_types.py b/python/knot_resolver_manager/datamodel/types/generic_types.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/types/generic_types.py rename to python/knot_resolver_manager/datamodel/types/generic_types.py diff --git a/manager/knot_resolver_manager/datamodel/types/types.py b/python/knot_resolver_manager/datamodel/types/types.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/types/types.py rename to python/knot_resolver_manager/datamodel/types/types.py diff --git a/manager/knot_resolver_manager/datamodel/view_schema.py b/python/knot_resolver_manager/datamodel/view_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/view_schema.py rename to python/knot_resolver_manager/datamodel/view_schema.py diff --git a/manager/knot_resolver_manager/datamodel/webmgmt_schema.py b/python/knot_resolver_manager/datamodel/webmgmt_schema.py similarity index 100% rename from manager/knot_resolver_manager/datamodel/webmgmt_schema.py rename to python/knot_resolver_manager/datamodel/webmgmt_schema.py diff --git a/manager/knot_resolver_manager/exceptions.py b/python/knot_resolver_manager/exceptions.py similarity index 100% rename from manager/knot_resolver_manager/exceptions.py rename to python/knot_resolver_manager/exceptions.py diff --git a/manager/knot_resolver_manager/kres_manager.py b/python/knot_resolver_manager/kres_manager.py similarity index 100% rename from manager/knot_resolver_manager/kres_manager.py rename to python/knot_resolver_manager/kres_manager.py diff --git a/manager/knot_resolver_manager/kresd_controller/__init__.py b/python/knot_resolver_manager/kresd_controller/__init__.py similarity index 100% rename from manager/knot_resolver_manager/kresd_controller/__init__.py rename to python/knot_resolver_manager/kresd_controller/__init__.py diff --git a/manager/knot_resolver_manager/kresd_controller/interface.py b/python/knot_resolver_manager/kresd_controller/interface.py similarity index 100% rename from manager/knot_resolver_manager/kresd_controller/interface.py rename to python/knot_resolver_manager/kresd_controller/interface.py diff --git a/manager/knot_resolver_manager/kresd_controller/registered_workers.py b/python/knot_resolver_manager/kresd_controller/registered_workers.py similarity index 100% rename from manager/knot_resolver_manager/kresd_controller/registered_workers.py rename to python/knot_resolver_manager/kresd_controller/registered_workers.py diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/__init__.py b/python/knot_resolver_manager/kresd_controller/supervisord/__init__.py similarity index 100% rename from manager/knot_resolver_manager/kresd_controller/supervisord/__init__.py rename to python/knot_resolver_manager/kresd_controller/supervisord/__init__.py diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/config_file.py b/python/knot_resolver_manager/kresd_controller/supervisord/config_file.py similarity index 100% rename from manager/knot_resolver_manager/kresd_controller/supervisord/config_file.py rename to python/knot_resolver_manager/kresd_controller/supervisord/config_file.py diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/fast_rpcinterface.py b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/fast_rpcinterface.py similarity index 100% rename from manager/knot_resolver_manager/kresd_controller/supervisord/plugin/fast_rpcinterface.py rename to python/knot_resolver_manager/kresd_controller/supervisord/plugin/fast_rpcinterface.py diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/manager_integration.py b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/manager_integration.py similarity index 100% rename from manager/knot_resolver_manager/kresd_controller/supervisord/plugin/manager_integration.py rename to python/knot_resolver_manager/kresd_controller/supervisord/plugin/manager_integration.py diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c similarity index 100% rename from manager/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c rename to python/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py similarity index 100% rename from manager/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py rename to python/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/sd_notify.py b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/sd_notify.py similarity index 100% rename from manager/knot_resolver_manager/kresd_controller/supervisord/plugin/sd_notify.py rename to python/knot_resolver_manager/kresd_controller/supervisord/plugin/sd_notify.py diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 b/python/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 similarity index 100% rename from manager/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 rename to python/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 diff --git a/manager/knot_resolver_manager/log.py b/python/knot_resolver_manager/log.py similarity index 100% rename from manager/knot_resolver_manager/log.py rename to python/knot_resolver_manager/log.py diff --git a/manager/knot_resolver_manager/main.py b/python/knot_resolver_manager/main.py similarity index 100% rename from manager/knot_resolver_manager/main.py rename to python/knot_resolver_manager/main.py diff --git a/manager/knot_resolver_manager/server.py b/python/knot_resolver_manager/server.py similarity index 100% rename from manager/knot_resolver_manager/server.py rename to python/knot_resolver_manager/server.py diff --git a/manager/knot_resolver_manager/statistics.py b/python/knot_resolver_manager/statistics.py similarity index 100% rename from manager/knot_resolver_manager/statistics.py rename to python/knot_resolver_manager/statistics.py diff --git a/manager/knot_resolver_manager/utils/__init__.py b/python/knot_resolver_manager/utils/__init__.py similarity index 100% rename from manager/knot_resolver_manager/utils/__init__.py rename to python/knot_resolver_manager/utils/__init__.py diff --git a/manager/knot_resolver_manager/utils/async_utils.py b/python/knot_resolver_manager/utils/async_utils.py similarity index 100% rename from manager/knot_resolver_manager/utils/async_utils.py rename to python/knot_resolver_manager/utils/async_utils.py diff --git a/manager/knot_resolver_manager/utils/custom_atexit.py b/python/knot_resolver_manager/utils/custom_atexit.py similarity index 100% rename from manager/knot_resolver_manager/utils/custom_atexit.py rename to python/knot_resolver_manager/utils/custom_atexit.py diff --git a/manager/knot_resolver_manager/utils/etag.py b/python/knot_resolver_manager/utils/etag.py similarity index 100% rename from manager/knot_resolver_manager/utils/etag.py rename to python/knot_resolver_manager/utils/etag.py diff --git a/manager/knot_resolver_manager/utils/functional.py b/python/knot_resolver_manager/utils/functional.py similarity index 100% rename from manager/knot_resolver_manager/utils/functional.py rename to python/knot_resolver_manager/utils/functional.py diff --git a/manager/knot_resolver_manager/utils/modeling/README.md b/python/knot_resolver_manager/utils/modeling/README.md similarity index 100% rename from manager/knot_resolver_manager/utils/modeling/README.md rename to python/knot_resolver_manager/utils/modeling/README.md diff --git a/manager/knot_resolver_manager/utils/modeling/__init__.py b/python/knot_resolver_manager/utils/modeling/__init__.py similarity index 100% rename from manager/knot_resolver_manager/utils/modeling/__init__.py rename to python/knot_resolver_manager/utils/modeling/__init__.py diff --git a/manager/knot_resolver_manager/utils/modeling/base_generic_type_wrapper.py b/python/knot_resolver_manager/utils/modeling/base_generic_type_wrapper.py similarity index 100% rename from manager/knot_resolver_manager/utils/modeling/base_generic_type_wrapper.py rename to python/knot_resolver_manager/utils/modeling/base_generic_type_wrapper.py diff --git a/manager/knot_resolver_manager/utils/modeling/base_schema.py b/python/knot_resolver_manager/utils/modeling/base_schema.py similarity index 100% rename from manager/knot_resolver_manager/utils/modeling/base_schema.py rename to python/knot_resolver_manager/utils/modeling/base_schema.py diff --git a/manager/knot_resolver_manager/utils/modeling/base_value_type.py b/python/knot_resolver_manager/utils/modeling/base_value_type.py similarity index 100% rename from manager/knot_resolver_manager/utils/modeling/base_value_type.py rename to python/knot_resolver_manager/utils/modeling/base_value_type.py diff --git a/manager/knot_resolver_manager/utils/modeling/exceptions.py b/python/knot_resolver_manager/utils/modeling/exceptions.py similarity index 100% rename from manager/knot_resolver_manager/utils/modeling/exceptions.py rename to python/knot_resolver_manager/utils/modeling/exceptions.py diff --git a/manager/knot_resolver_manager/utils/modeling/json_pointer.py b/python/knot_resolver_manager/utils/modeling/json_pointer.py similarity index 100% rename from manager/knot_resolver_manager/utils/modeling/json_pointer.py rename to python/knot_resolver_manager/utils/modeling/json_pointer.py diff --git a/manager/knot_resolver_manager/utils/modeling/parsing.py b/python/knot_resolver_manager/utils/modeling/parsing.py similarity index 100% rename from manager/knot_resolver_manager/utils/modeling/parsing.py rename to python/knot_resolver_manager/utils/modeling/parsing.py diff --git a/manager/knot_resolver_manager/utils/modeling/query.py b/python/knot_resolver_manager/utils/modeling/query.py similarity index 100% rename from manager/knot_resolver_manager/utils/modeling/query.py rename to python/knot_resolver_manager/utils/modeling/query.py diff --git a/manager/knot_resolver_manager/utils/modeling/renaming.py b/python/knot_resolver_manager/utils/modeling/renaming.py similarity index 100% rename from manager/knot_resolver_manager/utils/modeling/renaming.py rename to python/knot_resolver_manager/utils/modeling/renaming.py diff --git a/manager/knot_resolver_manager/utils/modeling/types.py b/python/knot_resolver_manager/utils/modeling/types.py similarity index 100% rename from manager/knot_resolver_manager/utils/modeling/types.py rename to python/knot_resolver_manager/utils/modeling/types.py diff --git a/manager/knot_resolver_manager/utils/requests.py b/python/knot_resolver_manager/utils/requests.py similarity index 100% rename from manager/knot_resolver_manager/utils/requests.py rename to python/knot_resolver_manager/utils/requests.py diff --git a/manager/knot_resolver_manager/utils/systemd_notify.py b/python/knot_resolver_manager/utils/systemd_notify.py similarity index 100% rename from manager/knot_resolver_manager/utils/systemd_notify.py rename to python/knot_resolver_manager/utils/systemd_notify.py diff --git a/manager/knot_resolver_manager/utils/which.py b/python/knot_resolver_manager/utils/which.py similarity index 100% rename from manager/knot_resolver_manager/utils/which.py rename to python/knot_resolver_manager/utils/which.py diff --git a/scripts/meson/make-doc.sh b/scripts/meson/make-doc.sh index aecf04107..a472d4cba 100755 --- a/scripts/meson/make-doc.sh +++ b/scripts/meson/make-doc.sh @@ -4,7 +4,7 @@ set -o errexit -o nounset cd "$(dirname "${0}")/../.." # generate JSON schema for the manager's declarative config -pushd manager +pushd python ## the following python command should hopefully run without any dependencies except for standard python mkdir -p ../doc/_static/ python3 -m knot_resolver_manager.cli schema > ../doc/_static/config.schema.json diff --git a/scripts/poe-tasks/check b/scripts/poe-tasks/check index ff7bdf9fd..49491c11e 100755 --- a/scripts/poe-tasks/check +++ b/scripts/poe-tasks/check @@ -32,25 +32,25 @@ fi # check formatting using black echo -e "${yellow}Checking formatting using black...${reset}" -black manager/knot_resolver_manager tests/manager scripts/poe-tasks/utils/create_setup.py --check --diff +black python/knot_resolver_manager tests/manager scripts/poe-tasks/utils/create_setup.py --check --diff check_rv $? echo # check code with pylint echo -e "${yellow}Linting using pylint...${reset}" -pylint manager/knot_resolver_manager +pylint python/knot_resolver_manager check_rv $? echo # check code with flake8 echo -e "${yellow}Linting using flake8...${reset}" -flake8 --max-line-length=200 --ignore=E266,W503 --extend-ignore=E203 manager/knot_resolver_manager +flake8 --max-line-length=200 --ignore=E266,W503 --extend-ignore=E203 python/knot_resolver_manager check_rv $? echo # check types with mypy echo -e "${yellow}Type checking using mypy...${reset}" -mypy manager/knot_resolver_manager +mypy python/knot_resolver_manager check_rv $? echo diff --git a/scripts/poe-tasks/format b/scripts/poe-tasks/format index 80b2da0d7..e9e192871 100755 --- a/scripts/poe-tasks/format +++ b/scripts/poe-tasks/format @@ -4,7 +4,7 @@ src_dir="$(dirname "$(realpath "$0")")" source $src_dir/utils/_env.sh -dirs="manager/knot_resolver_manager/ tests/manager scripts/poe-tasks/utils/create_setup.py build_c_extensions.py" +dirs="python/knot_resolver_manager/ tests/manager scripts/poe-tasks/utils/create_setup.py build_c_extensions.py" # run black code formater black $dirs diff --git a/scripts/poe-tasks/run b/scripts/poe-tasks/run index 23a339595..a3f08177b 100755 --- a/scripts/poe-tasks/run +++ b/scripts/poe-tasks/run @@ -14,8 +14,8 @@ poetry build shopt -s globstar shopt -s nullglob for d in build/lib*; do - for f in "manager/$d/"**/*.so; do - cp -v "$f" ${f#"manager/$d/"} + for f in "python/$d/"**/*.so; do + cp -v "$f" ${f#"python/$d/"} done done shopt -u globstar diff --git a/scripts/poe-tasks/test b/scripts/poe-tasks/test index 43aa403ac..6b37dff74 100755 --- a/scripts/poe-tasks/test +++ b/scripts/poe-tasks/test @@ -5,4 +5,4 @@ src_dir="$(dirname "$(realpath "$0")")" source $src_dir/utils/_env.sh # run pytest -env PYTHONPATH=. pytest --junitxml=unit.junit.xml --cov=manager/knot_resolver_manager --show-capture=all tests/manager +env PYTHONPATH=. pytest --junitxml=unit.junit.xml --cov=python/knot_resolver_manager --show-capture=all tests/manager diff --git a/setup.py b/setup.py index 16b3c3a12..04eb40ee4 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup package_dir = \ -{'': 'manager'} +{'': 'python'} packages = \ ['knot_resolver_manager', diff --git a/manager/shell-completion/client.bash b/utils/shell-completion/client.bash similarity index 100% rename from manager/shell-completion/client.bash rename to utils/shell-completion/client.bash diff --git a/manager/shell-completion/client.fish b/utils/shell-completion/client.fish similarity index 100% rename from manager/shell-completion/client.fish rename to utils/shell-completion/client.fish diff --git a/manager/shell-completion/meson.build b/utils/shell-completion/meson.build similarity index 100% rename from manager/shell-completion/meson.build rename to utils/shell-completion/meson.build