diff --git a/.gitignore b/.gitignore index 234fb5b..ed761f6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ __pycache__/ build/ tests/cli.toml -pytest_pulp_cli/GPG-PRIVATE-KEY-fixture-signing +GPG-PRIVATE-KEY-fixture-signing site/ dist/ *.po~ diff --git a/Makefile b/Makefile index ceed7c1..7f73716 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ lint: ruff check --diff .ci/scripts/check_cli_dependencies.py .ci/scripts/check_click_for_mypy.py - MYPYPATH=pulp-glue-gem mypy + mypy cd pulp-glue-gem; mypy @echo "🙊 Code 🙈 LGTM 🙉 !" diff --git a/pulp-glue-gem/pyproject.toml b/pulp-glue-gem/pyproject.toml index b6b2bfb..1bfdc0e 100644 --- a/pulp-glue-gem/pyproject.toml +++ b/pulp-glue-gem/pyproject.toml @@ -47,6 +47,7 @@ strict = true warn_unused_ignores = false show_error_codes = true files = "pulp_glue/**/*.py, tests/**/*.py" +mypy_path = ["."] namespace_packages = true explicit_package_bases = true diff --git a/pyproject.toml b/pyproject.toml index 474cd5b..635782d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,6 +49,7 @@ namespaces = true # This section is co-managed by the cookiecutter templates. # Changes to existing keys should be preserved. app_label = "gem" +src_layout = false repository = "https://github.com/pulp/pulp-cli-gem" glue = true docs = false @@ -122,6 +123,7 @@ strict = true warn_unused_ignores = false show_error_codes = true files = "pulpcore/**/*.py, tests/*.py" +mypy_path = [".", "pulp-glue-gem"] namespace_packages = true explicit_package_bases = true @@ -199,4 +201,3 @@ extend-select = ["I"] sections = { second-party = ["pulp_glue"] } section-order = ["future", "standard-library", "third-party", "second-party", "first-party", "local-folder"] - diff --git a/tests/scripts/config.source b/tests/scripts/config.source index 16e38ae..5901cc6 100644 --- a/tests/scripts/config.source +++ b/tests/scripts/config.source @@ -64,7 +64,7 @@ expect_deny () { cat log.err >&3 false else - if grep -q "You do not have permission" log.err + if grep -q "Operation .* not authorized." log.err then echo "SUCCESS [! $@]" >&3 OUTPUT="$(cat log.out)"