python: unification of modules execution

Author: alesmrazek

pyproject.toml

@@ -65,8 +65,8 @@ breathe = "^4.35.0"
 json-schema-for-humans = "^0.47"
 
 [tool.poetry.scripts]
-kresctl = 'knot_resolver.client.main:main'
-knot-resolver = 'knot_resolver.manager.main:main'
+kresctl = "knot_resolver.client.__main__"
+knot-resolver = 'knot_resolver.manager.__main__'
 
 [tool.poe.tasks]
 # tasks runed through scripts located in 'scripts/poe-tasks/'

scripts/poe-tasks/check

@@ -37,7 +37,7 @@ echo
 
 # check that doc/_static/config.schema.json is the latest
 echo -e "${yellow}Checking doc/_static/config.schema.json${reset}"
-python -m knot_resolver.client schema | diff - doc/_static/config.schema.json
+python -m knot_resolver.client.__main__ schema | diff - doc/_static/config.schema.json
 check_rv $?
 echo
 

scripts/poe-tasks/examples

@@ -7,5 +7,5 @@ source $src_dir/utils/_env.sh
 # validate all configuration examples
 for example in $PWD/etc/config/config.example.*.yaml;
 do
-    python3 -m knot_resolver.client validate --no-strict $example;
+    python3 -m knot_resolver.client.__main__ validate --no-strict $example;
 done

scripts/poe-tasks/kresctl

@@ -9,4 +9,4 @@ is_build_dev_dir_configured
 echo
 
 # run knot-resolver client
-python3 -m knot_resolver.client --config "$KRES_DEV_CONFIG_FILE" "$@"
+python3 -m knot_resolver.client.__main__ --config "$KRES_DEV_CONFIG_FILE" "$@"

scripts/poe-tasks/run

@@ -32,4 +32,4 @@ echo
 echo --------------------------------------
 echo Starting Knot Resolver wit the Manager
 echo --------------------------------------
-python3 -m knot_resolver.manager --config "$KRES_DEV_CONFIG_FILE" "$@"
+python3 -m knot_resolver.manager.__main__ --config "$KRES_DEV_CONFIG_FILE" "$@"

scripts/poe-tasks/schema

@@ -8,6 +8,6 @@ schema_file="$gitroot/doc/_static/config.schema.json"
 
 meson_setup_configure > /dev/null
 cp $build_dir/python/knot_resolver/constants.py $gitroot/python/knot_resolver/constants.py
-python -m knot_resolver.client schema > $schema_file
+python -m knot_resolver.client.__main__ schema > $schema_file
 
 echo New JSON schema saved to $schema_file