python: knot_resolver_manager module renamed to knot_resolver

5 files changed, 10 insertions, 12 deletions

diff --git a/scripts/meson/make-doc.sh b/scripts/meson/make-doc.sh
index 0e14da4b..787b8a37 100755
--- a/scripts/meson/make-doc.sh
+++ b/scripts/meson/make-doc.sh
@@ -4,12 +4,10 @@ set -o errexit -o nounset
 cd "$(dirname "${0}")/../.."
 
 # generate JSON schema for the manager's declarative config
-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.client schema > ../doc/_static/config.schema.json
-generate-schema-doc --config expand_buttons=true ../doc/_static/config.schema.json ../doc/_static/schema_doc.html
-popd
+mkdir -p doc/_static/
+python3 -m python.knot_resolver.client schema > doc/_static/config.schema.json
+generate-schema-doc --config expand_buttons=true doc/_static/config.schema.json doc/_static/schema_doc.html
 
 # generating the user documentation
 SPHINX=$(type -P sphinx-build-3 sphinx-build | head -n1)
diff --git a/scripts/poe-tasks/check b/scripts/poe-tasks/check
index 49491c11..8aa33b36 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 python/knot_resolver_manager tests/manager scripts/poe-tasks/utils/create_setup.py --check --diff
+black python/knot_resolver 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 python/knot_resolver_manager
+pylint python/knot_resolver
 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 python/knot_resolver_manager
+flake8 --max-line-length=200 --ignore=E266,W503 --extend-ignore=E203 python/knot_resolver
 check_rv $?
 echo
 
 # check types with mypy
 echo -e "${yellow}Type checking using mypy...${reset}"
-mypy python/knot_resolver_manager
+mypy python/knot_resolver
 check_rv $?
 echo
 
diff --git a/scripts/poe-tasks/kresctl b/scripts/poe-tasks/kresctl
index 922d0624..50e028fc 100755
--- a/scripts/poe-tasks/kresctl
+++ b/scripts/poe-tasks/kresctl
@@ -5,4 +5,4 @@ src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/utils/_env.sh
 
 # run knot-resolver client
-python3 -m knot_resolver_manager.client $@
+python3 -m knot_resolver.client $@
diff --git a/scripts/poe-tasks/run b/scripts/poe-tasks/run
index 77b2d131..90f02632 100755
--- a/scripts/poe-tasks/run
+++ b/scripts/poe-tasks/run
@@ -26,4 +26,4 @@ echo The Knot Resolver management API is accessible on http://localhost:5000
 echo -----------------------------------------------------------------------
 
 # run the knot-resolver manager
-python3 -m knot_resolver_manager.manager $@
+python3 -m knot_resolver.manager $@
diff --git a/scripts/poe-tasks/test b/scripts/poe-tasks/test
index 6b37dff7..85fd6089 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=python/knot_resolver_manager --show-capture=all tests/manager
+env PYTHONPATH=. pytest --junitxml=unit.junit.xml --cov=python/knot_resolver --show-capture=all tests/manager