Adapt src layout

Makefile

@@ -1,6 +1,6 @@
 
-GLUE_PLUGINS=$(notdir $(wildcard pulp-glue-gem/pulp_glue/*))
-CLI_PLUGINS=$(notdir $(wildcard pulpcore/cli/*))
+GLUE_PLUGINS=$(notdir $(wildcard pulp-glue-gem/src/pulp_glue/*))
+CLI_PLUGINS=$(notdir $(wildcard src/pulpcore/cli/*))
 
 .PHONY: info
 info:

pulp-glue-gem/pyproject.toml

@@ -32,7 +32,7 @@ changelog = "https://github.com/pulp/pulp-cli-gem/blob/main/CHANGES.md"
 
 [tool.setuptools.packages.find]
 # This section is managed by the cookiecutter templates.
-where = ["."]
+where = ["src"]
 include = ["pulp_glue.*"]
 namespaces = true
 
@@ -46,8 +46,8 @@ namespaces = true
 strict = true
 warn_unused_ignores = false
 show_error_codes = true
-files = "pulp_glue/**/*.py, tests/**/*.py"
-mypy_path = ["."]
+files = "src/**/*.py, tests/**/*.py"
+mypy_path = ["src"]
 namespace_packages = true
 explicit_package_bases = true
 

pyproject.toml

@@ -36,7 +36,7 @@ gem = "pulpcore.cli.gem"
 
 [tool.setuptools.packages.find]
 # This section is managed by the cookiecutter templates.
-where = ["."]
+where = ["src"]
 include = ["pulpcore.cli.*"]
 namespaces = true
 
@@ -49,7 +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
+src_layout = true
 repository = "https://github.com/pulp/pulp-cli-gem"
 glue = true
 docs = false
@@ -122,8 +122,8 @@ markers = [
 strict = true
 warn_unused_ignores = false
 show_error_codes = true
-files = "pulpcore/**/*.py, tests/*.py"
-mypy_path = [".", "pulp-glue-gem"]
+files = "src/**/*.py, tests/*.py"
+mypy_path = ["src", "pulp-glue-gem/src"]
 namespace_packages = true
 explicit_package_bases = true
 
@@ -158,13 +158,13 @@ values = [
 
 [[tool.bumpversion.files]]
 # This section is managed by the cookiecutter templates.
-filename = "./pulp-glue-gem/pulp_glue/gem/__init__.py"
+filename = "./pulp-glue-gem/src/pulp_glue/gem/__init__.py"
 search = "__version__ = \"{current_version}\""
 replace = "__version__ = \"{new_version}\""
 
 [[tool.bumpversion.files]]
 # This section is managed by the cookiecutter templates.
-filename = "./pulpcore/cli/gem/__init__.py"
+filename = "./src/pulpcore/cli/gem/__init__.py"
 search = "__version__ = \"{current_version}\""
 replace = "__version__ = \"{new_version}\""