Update cookiecutter

Author: pulpbot

.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~

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-maven mypy
+	mypy
 	cd pulp-glue-maven; mypy
 	@echo "🙊 Code 🙈 LGTM 🙉 !"
 

lint_requirements.txt

@@ -1,5 +1,5 @@
 # Lint requirements
-ruff~=0.15.0
+ruff~=0.15.1
 mypy~=1.19.1
 shellcheck-py~=0.11.0.1
 

pulp-glue-maven/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
 

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 = "maven"
+src_layout = false
 repository = "https://github.com/pulp/pulp-cli-maven"
 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-maven"]
 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"]
 
-

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)"
@@ -80,4 +80,28 @@ expect_deny () {
   fi
 }
 
+# Expects the provided test to pass
+# Supresses all output, which is redirected to ASSERTION_OUTPUT and
+# ASSERTION_ERROUTPUT so as not to overwrite the latest OUTPUT and ERROUTPUT.
+# That way we can test several assertions in a row.
+# Reports verbosely on failure.
+assert () {
+  if {
+    [[ "$@" ]]
+  } 1>log.out 2>log.err
+  then
+    echo "SUCCESS [$@]" >&3
+    ASSERTION_OUTPUT="$(cat log.out)"
+    ASSERTION_ERROUTPUT="$(cat log.err)"
+  else
+    echo "FAILURE [$@]" >&3
+    echo "=== STDOUT ===" >&3
+    cat log.out >&3
+    echo "=== STDERR ===" >&3
+    cat log.err >&3
+    echo "==============" >&3
+    false
+  fi
+}
+
 set -eu