Support Python packages with no namespace or multiple namespaces

plone · Oct 27, 2024 · 510b2a2 · 510b2a2
1 parent 6f17615
commit 510b2a2
Show file tree

Hide file tree

Showing 76 changed files with 83 additions and 103 deletions.
diff --git a/backend_addon/cookiecutter.json b/backend_addon/cookiecutter.json
@@ -5,14 +5,11 @@
   "email": "[email protected]",
   "github_organization": "collective",
   "python_package_name": "{{ cookiecutter.github_organization|lower }}.{{ cookiecutter.title|replace(' ', '')|replace('-', '_')|replace('.', '')|lower }}",
-  "feature_headless": [
-    "1",
-    "0"
-  ],
+  "feature_headless": ["1", "0"],
   "__feature_headless": "{{ cookiecutter.feature_headless }}",
   "__feature_distribution": "0",
-  "__package_name": "{{ cookiecutter.python_package_name | package_name }}",
-  "__package_namespace": "{{ cookiecutter.python_package_name | package_namespace }}",
+  "__package_namespaces": "{{ cookiecutter.python_package_name | package_namespaces }}",
+  "__package_path": "{{ cookiecutter.python_package_name | package_path }}",
   "__folder_name": "{{ cookiecutter.python_package_name }}",
   "__python_package_name_upper": "{{ cookiecutter.python_package_name | pascal_case }}",
   "__profile_language": "en",
@@ -38,8 +35,8 @@
   "_copy_without_render": [],
   "_extensions": [
     "cookieplone.filters.pascal_case",
-    "cookieplone.filters.package_name",
-    "cookieplone.filters.package_namespace"
+    "cookieplone.filters.package_namespaces",
+    "cookieplone.filters.package_path"
   ],
   "__cookieplone_repository_path": "",
   "__cookieplone_template": ""

diff --git a/backend_addon/hooks/post_gen_project.py b/backend_addon/hooks/post_gen_project.py
@@ -3,7 +3,9 @@
 from collections import OrderedDict
 from copy import deepcopy
 from pathlib import Path
+import os
 
+from cookieplone.settings import QUIET_MODE_VAR
 from cookieplone.utils import console, files, git, plone
 
 context: OrderedDict = {{cookiecutter}}
@@ -18,12 +20,18 @@
 
 
 def handle_feature_headless(context: OrderedDict, output_dir: Path):
-    package_namespace = context.get("__package_namespace")
-    package_name = context.get("__package_name")
-    output_dir = output_dir / "src" / package_namespace / package_name
+    output_dir = output_dir / "src" / "packagename"
     files.remove_files(output_dir, FEATURES_TO_REMOVE["feature_headless"])
 
 
+def handle_create_namespace_packages(context: OrderedDict, output_dir: Path):
+    plone.create_namespace_packages(output_dir / "src/packagename", context["python_package_name"])
+
+
+def handle_format(context: OrderedDict, output_dir: Path):
+    plone.format_python_codebase(output_dir)
+
+
 def handle_git_initialization(context: OrderedDict, output_dir: Path):
     """Initialize a GIT repository for the project codebase."""
     git.initialize_repository(output_dir)
@@ -32,9 +40,11 @@ def handle_git_initialization(context: OrderedDict, output_dir: Path):
 def main():
     """Final fixes."""
     output_dir = Path().cwd()
+    is_subtemplate = os.environ.get(QUIET_MODE_VAR) == "1"
     remove_headless = not int(
         context.get("feature_headless")
     )  # {{ cookiecutter.__feature_headless }}
+    create_namespace_packages = not is_subtemplate
     initialize_git = bool(
         int(context.get("__backend_addon_git_initialize"))
     )  # {{ cookiecutter.__backend_addon_git_initialize }}
@@ -48,6 +58,16 @@ def main():
             "Remove files used in headless setup",
             remove_headless,
         ],
+        [
+            handle_create_namespace_packages,
+            "Create namespace packages",
+            create_namespace_packages,
+        ],
+        [
+            handle_format,
+            "Format code",
+            backend_format,
+        ],
         [
             handle_git_initialization,
             "Initialize Git repository",
@@ -61,18 +81,10 @@ def main():
         console.print(f" -> {title}")
         func(new_context, output_dir)
 
-    # Run format
-    if backend_format:
-        plone.format_python_codebase(output_dir)
-
     msg = """
         [bold blue]{{ cookiecutter.title }}[/bold blue]
 
-        Now, enter the repository run the code formatter with:
-
-        make format
-
-        start coding, and push to your organization.
+        Now, enter the repository, start coding, and push to your organization.
 
         Sorry for the convenience,
         The Plone Community.

diff --git a/backend_addon/tests/test_cutter.py b/backend_addon/tests/test_cutter.py
@@ -40,10 +40,8 @@ def test_root_files_generated(cutter_result, file_path):
 @pytest.mark.parametrize("file_path", PKG_SRC_FILES)
 def test_pkg_src_files_generated(cutter_result, file_path: str):
     """Check if distribution files were generated."""
-    package_namespace = cutter_result.context["__package_namespace"]
-    package_name = cutter_result.context["__package_name"]
-    file_path = file_path.format(package_name=package_name)
-    src_path = cutter_result.project_path / "src" / package_namespace / package_name
+    package_path = cutter_result.context["__package_path"]
+    src_path = cutter_result.project_path / "src" / package_path
     path = src_path / file_path
     assert path.exists()
     assert path.is_file()
@@ -52,9 +50,8 @@ def test_pkg_src_files_generated(cutter_result, file_path: str):
 @pytest.mark.parametrize("file_path", PKG_SRC_FEATURE_HEADLESS)
 def test_pkg_src_feature_files_generated(cutter_result, file_path: str):
     """Check if feature-specific files were generated."""
-    package_namespace = cutter_result.context["__package_namespace"]
-    package_name = cutter_result.context["__package_name"]
-    src_path = cutter_result.project_path / "src" / package_namespace / package_name
+    package_path = cutter_result.context["__package_path"]
+    src_path = cutter_result.project_path / "src" / package_path
     path = src_path / file_path
     assert path.exists()
     assert path.is_file()

diff --git a/backend_addon/tests/test_cutter_no_headless.py b/backend_addon/tests/test_cutter_no_headless.py
@@ -44,10 +44,8 @@ def test_root_files_generated(cutter_result, file_path):
 @pytest.mark.parametrize("file_path", PKG_SRC_FILES)
 def test_pkg_src_files_generated(cutter_result, file_path: str):
     """Check if distribution files were generated."""
-    package_namespace = cutter_result.context["__package_namespace"]
-    package_name = cutter_result.context["__package_name"]
-    file_path = file_path.format(package_name=package_name)
-    src_path = cutter_result.project_path / "src" / package_namespace / package_name
+    package_path = cutter_result.context["__package_path"]
+    src_path = cutter_result.project_path / "src" / package_path
     path = src_path / file_path
     assert path.exists()
     assert path.is_file()
@@ -56,8 +54,9 @@ def test_pkg_src_files_generated(cutter_result, file_path: str):
 @pytest.mark.parametrize("file_path", PKG_SRC_FEATURE_HEADLESS)
 def test_pkg_src_headless_files_not_generated(cutter_result, file_path: str):
     """Check feature-specific files were not generated."""
-    package_namespace = cutter_result.context["__package_namespace"]
-    package_name = cutter_result.context["__package_name"]
-    src_path = cutter_result.project_path / "src" / package_namespace / package_name
+    package_path = cutter_result.context["__package_path"]
+    src_path = cutter_result.project_path / "src" / package_path
     path = src_path / file_path
     assert path.exists() is False
+
+# test with 0 and 2 namespaces
diff --git a/backend_addon/{{ cookiecutter.__folder_name }}/MANIFEST.in b/backend_addon/{{ cookiecutter.__folder_name }}/MANIFEST.in
@@ -1,4 +1,4 @@
-graft src/{{ cookiecutter.__package_namespace }}
+graft src/{{ cookiecutter.__package_path }}
 graft docs
 graft news
 graft tests

diff --git a/backend_addon/{{ cookiecutter.__folder_name }}/setup.py b/backend_addon/{{ cookiecutter.__folder_name }}/setup.py
@@ -46,7 +46,7 @@
     },
     license="GPL version 2",
     packages=find_packages("src", exclude=["ez_setup"]),
-    namespace_packages=["{{ cookiecutter.__package_namespace }}"],
+    namespace_packages=[{{ cookiecutter.__package_namespaces }}],
     package_dir={"": "src"},
     include_package_data=True,
     zip_safe=False,

diff --git a/...ookiecutter.__package_name }}/__init__.py → ...older_name }}/src/packagename/__init__.py b/...ookiecutter.__package_name }}/__init__.py → ...older_name }}/src/packagename/__init__.py
diff --git a/...iecutter.__package_name }}/configure.zcml → ...er_name }}/src/packagename/configure.zcml b/...iecutter.__package_name }}/configure.zcml → ...er_name }}/src/packagename/configure.zcml
diff --git a/...ter.__package_name }}/content/__init__.py → ...me }}/src/packagename/content/__init__.py b/...ter.__package_name }}/content/__init__.py → ...me }}/src/packagename/content/__init__.py
diff --git a/..._package_name }}/controlpanel/__init__.py → .../src/packagename/controlpanel/__init__.py b/..._package_name }}/controlpanel/__init__.py → .../src/packagename/controlpanel/__init__.py
diff --git a/...ckage_name }}/controlpanel/configure.zcml → ...c/packagename/controlpanel/configure.zcml b/...ckage_name }}/controlpanel/configure.zcml → ...c/packagename/controlpanel/configure.zcml
diff --git a/...utter.__package_name }}/dependencies.zcml → ...name }}/src/packagename/dependencies.zcml b/...utter.__package_name }}/dependencies.zcml → ...name }}/src/packagename/dependencies.zcml
diff --git a/...er.__package_name }}/indexers/__init__.py → ...e }}/src/packagename/indexers/__init__.py b/...er.__package_name }}/indexers/__init__.py → ...e }}/src/packagename/indexers/__init__.py
diff --git a/...__package_name }}/indexers/configure.zcml → ...}/src/packagename/indexers/configure.zcml b/...__package_name }}/indexers/configure.zcml → ...}/src/packagename/indexers/configure.zcml
diff --git a/...kiecutter.__package_name }}/interfaces.py → ...der_name }}/src/packagename/interfaces.py b/...kiecutter.__package_name }}/interfaces.py → ...der_name }}/src/packagename/interfaces.py
diff --git a/...ter.__package_name }}/locales/__init__.py → ...me }}/src/packagename/locales/__init__.py b/...ter.__package_name }}/locales/__init__.py → ...me }}/src/packagename/locales/__init__.py
diff --git a/...{{ cookiecutter.python_package_name }}.po → ...{{ cookiecutter.python_package_name }}.po b/...{{ cookiecutter.python_package_name }}.po → ...{{ cookiecutter.python_package_name }}.po
diff --git a/...utter.__package_name }}/locales/update.py → ...name }}/src/packagename/locales/update.py b/...utter.__package_name }}/locales/update.py → ...name }}/src/packagename/locales/update.py
diff --git a/...{ cookiecutter.python_package_name }}.pot → ...{ cookiecutter.python_package_name }}.pot b/...{ cookiecutter.python_package_name }}.pot → ...{ cookiecutter.python_package_name }}.pot
diff --git a/...kiecutter.__package_name }}/profiles.zcml → ...der_name }}/src/packagename/profiles.zcml b/...kiecutter.__package_name }}/profiles.zcml → ...der_name }}/src/packagename/profiles.zcml
diff --git a/...name }}/profiles/default/browserlayer.xml → ...agename/profiles/default/browserlayer.xml b/...name }}/profiles/default/browserlayer.xml → ...agename/profiles/default/browserlayer.xml
diff --git a/...kage_name }}/profiles/default/catalog.xml → .../packagename/profiles/default/catalog.xml b/...kage_name }}/profiles/default/catalog.xml → .../packagename/profiles/default/catalog.xml
diff --git a/...name }}/profiles/default/controlpanel.xml → ...agename/profiles/default/controlpanel.xml b/...name }}/profiles/default/controlpanel.xml → ...agename/profiles/default/controlpanel.xml
diff --git a/...ge_name }}/profiles/default/diff_tool.xml → ...ackagename/profiles/default/diff_tool.xml b/...ge_name }}/profiles/default/diff_tool.xml → ...ackagename/profiles/default/diff_tool.xml
diff --git a/...age_name }}/profiles/default/metadata.xml → ...packagename/profiles/default/metadata.xml b/...age_name }}/profiles/default/metadata.xml → ...packagename/profiles/default/metadata.xml
diff --git a/...ame }}/profiles/default/registry/.gitkeep → ...gename/profiles/default/registry/.gitkeep b/...ame }}/profiles/default/registry/.gitkeep → ...gename/profiles/default/registry/.gitkeep
diff --git a/...me }}/profiles/default/repositorytool.xml → ...ename/profiles/default/repositorytool.xml b/...me }}/profiles/default/repositorytool.xml → ...ename/profiles/default/repositorytool.xml
diff --git a/...kage_name }}/profiles/default/rolemap.xml → .../packagename/profiles/default/rolemap.xml b/...kage_name }}/profiles/default/rolemap.xml → .../packagename/profiles/default/rolemap.xml
diff --git a/...ackage_name }}/profiles/default/theme.xml → ...rc/packagename/profiles/default/theme.xml b/...ackage_name }}/profiles/default/theme.xml → ...rc/packagename/profiles/default/theme.xml
diff --git a/...ackage_name }}/profiles/default/types.xml → ...rc/packagename/profiles/default/types.xml b/...ackage_name }}/profiles/default/types.xml → ...rc/packagename/profiles/default/types.xml
diff --git a/...e_name }}/profiles/default/types/.gitkeep → ...ckagename/profiles/default/types/.gitkeep b/...e_name }}/profiles/default/types/.gitkeep → ...ckagename/profiles/default/types/.gitkeep
diff --git a/...me }}/profiles/uninstall/browserlayer.xml → ...ename/profiles/uninstall/browserlayer.xml b/...me }}/profiles/uninstall/browserlayer.xml → ...ename/profiles/uninstall/browserlayer.xml
diff --git a/...__package_name }}/serializers/__init__.py → ...}/src/packagename/serializers/__init__.py b/...__package_name }}/serializers/__init__.py → ...}/src/packagename/serializers/__init__.py
diff --git a/...ackage_name }}/serializers/configure.zcml → ...rc/packagename/serializers/configure.zcml b/...ackage_name }}/serializers/configure.zcml → ...rc/packagename/serializers/configure.zcml
diff --git a/....__package_name }}/serializers/summary.py → ...}}/src/packagename/serializers/summary.py b/....__package_name }}/serializers/summary.py → ...}}/src/packagename/serializers/summary.py
diff --git a/...package_name }}/setuphandlers/__init__.py → ...src/packagename/setuphandlers/__init__.py b/...package_name }}/setuphandlers/__init__.py → ...src/packagename/setuphandlers/__init__.py
diff --git a/...cookiecutter.__package_name }}/testing.py → ...folder_name }}/src/packagename/testing.py b/...cookiecutter.__package_name }}/testing.py → ...folder_name }}/src/packagename/testing.py
diff --git a/...er.__package_name }}/upgrades/__init__.py → ...e }}/src/packagename/upgrades/__init__.py b/...er.__package_name }}/upgrades/__init__.py → ...e }}/src/packagename/upgrades/__init__.py
diff --git a/...__package_name }}/upgrades/configure.zcml → ...}/src/packagename/upgrades/configure.zcml b/...__package_name }}/upgrades/configure.zcml → ...}/src/packagename/upgrades/configure.zcml
diff --git a/..._package_name }}/vocabularies/__init__.py → .../src/packagename/vocabularies/__init__.py b/..._package_name }}/vocabularies/__init__.py → .../src/packagename/vocabularies/__init__.py
diff --git a/...ckage_name }}/vocabularies/configure.zcml → ...c/packagename/vocabularies/configure.zcml b/...ckage_name }}/vocabularies/configure.zcml → ...c/packagename/vocabularies/configure.zcml
diff --git a/...n/{{ cookiecutter.__folder_name }}/src/{{ cookiecutter.__package_namespace }}/__init__.py b/...n/{{ cookiecutter.__folder_name }}/src/{{ cookiecutter.__package_namespace }}/__init__.py
diff --git a/frontend_addon/tests/test_cutter.py b/frontend_addon/tests/test_cutter.py
@@ -91,7 +91,6 @@ def test_root_files_generated(cutter_result, file_path):
 def test_pkg_src_files_generated(cutter_result, file_path: str):
     """Check if package files were generated."""
     package_name = cutter_result.context["frontend_addon_name"]
-    file_path = file_path.format(package_name=package_name)
     src_path = cutter_result.project_path / "packages" / package_name
     path = src_path / file_path
     assert path.exists()

diff --git a/project/cookiecutter.json b/project/cookiecutter.json
@@ -12,23 +12,10 @@
   "frontend_addon_name": "volto-{{ cookiecutter.python_package_name|replace('_', '-')|replace('.', '-') }}",
   "language_code": ["en", "de", "es", "pt-br", "nl", "fi"],
   "github_organization": "collective",
-  "container_registry": [
-    "github",
-    "docker_hub",
-    "gitlab"
-  ],
-  "devops_cache": [
-    "1",
-    "0"
-  ],
-  "devops_ansible": [
-    "1",
-    "0"
-  ],
-  "devops_gha_deploy": [
-    "1",
-    "0"
-  ],
+  "container_registry": ["github", "docker_hub", "gitlab"],
+  "devops_cache": ["1", "0"],
+  "devops_ansible": ["1", "0"],
+  "devops_gha_deploy": ["1", "0"],
   "__feature_headless": "1",
   "__npm_package_name": "{{ cookiecutter.frontend_addon_name }}",
   "__folder_name": "{{ cookiecutter.project_slug }}",
@@ -65,8 +52,8 @@
   "__devops_varnish_version": "7.4",
   "__devops_db_version": "14",
   "__devops_db_password": "{{ random_ascii_string(12) }}",
-  "__backend_addon_format": "1",
   "__backend_addon_git_initialize": "0",
+  "__backend_addon_format": "1",
   "__project_git_initialize": "1",
   "__prompts__": {
     "title": "Project Title",
@@ -119,7 +106,6 @@
     "devops/tasks",
     "devops/inventory/group_vars/all/users.yml",
     "devops/inventory/group_vars/all/projects.yml"
-
   ],
   "_extensions": [
     "cookieplone.filters.use_prerelease_versions",

diff --git a/project/hooks/post_gen_project.py b/project/hooks/post_gen_project.py
@@ -145,6 +145,9 @@ def main():
         console.print(f" -> {title}")
         func(new_context, output_dir)
 
+    # Create namespace packages
+    plone.create_namespace_packages(output_dir / "backend/src/packagename", context["python_package_name"])
+
     # Run format
     if backend_format:
         backend_folder = output_dir / "backend"

diff --git a/sub/cache/cookiecutter.json b/sub/cache/cookiecutter.json
@@ -3,16 +3,9 @@
   "project_slug": "{{ cookiecutter.title | slugify }}",
   "author": "Plone Foundation",
   "email": "[email protected]",
-  "python_package_name": "{{ cookiecutter.project_slug|replace(' ', '')|replace('-', '.') }}",
   "github_organization": "collective",
-  "container_registry": [
-    "github",
-    "docker_hub",
-    "gitlab"
-  ],
+  "container_registry": ["github", "docker_hub", "gitlab"],
   "__folder_name": "{{ cookiecutter.project_slug }}",
-  "__package_name": "{{ cookiecutter.python_package_name | package_name }}",
-  "__package_namespace": "{{ cookiecutter.python_package_name | package_namespace }}",
   "__container_registry_prefix": "{{ cookiecutter.container_registry | image_prefix }}",
   "__container_image_prefix": "{{ cookiecutter.__container_registry_prefix }}{{ cookiecutter.github_organization }}/{{ cookiecutter.project_slug }}",
   "__gha_version_checkout": "v4",
@@ -22,13 +15,10 @@
   "__gha_version_docker_login": "v3",
   "__gha_version_docker_build_push": "v4",
   "__devops_varnish_version": "7.4",
-  "_copy_without_render": [
-  ],
+  "_copy_without_render": [],
   "_extensions": [
     "cookieplone.filters.extract_host",
-    "cookieplone.filters.image_prefix",
-    "cookieplone.filters.package_name",
-    "cookieplone.filters.package_namespace"
+    "cookieplone.filters.image_prefix"
   ],
   "__cookieplone_repository_path": "",
   "__cookieplone_template": ""

diff --git a/sub/cache/hooks/post_gen_project.py b/sub/cache/hooks/post_gen_project.py
@@ -39,9 +39,7 @@ def set_configurations(package_root: Path, context: OrderedDict):
 def main():
     """Final fixes."""
     output_dir = Path().cwd()
-    namespace = context.get("__package_namespace")
-    package_name = context.get("__package_name")
-    package_root = output_dir / "backend/src" / namespace / package_name
+    package_root = output_dir / "backend/src/packagename"
     set_configurations(package_root, context)
 
 

diff --git a/sub/cache/tests/test_cutter.py b/sub/cache/tests/test_cutter.py
@@ -41,8 +41,8 @@ def test_json_schema(
     "file_path",
     [
         ".github/workflows/varnish.yml",
-        "backend/src/project/title/profiles/default/registry/plone.cachepurging.interfaces.ICachePurgingSettings.xml",  # noQA
-        "backend/src/project/title/profiles/default/registry/plone.caching.interfaces.ICacheSettings.xml",  # noQA
+        "backend/src/packagename/profiles/default/registry/plone.cachepurging.interfaces.ICachePurgingSettings.xml",  # noQA
+        "backend/src/packagename/profiles/default/registry/plone.caching.interfaces.ICacheSettings.xml",  # noQA
         "devops/varnish/etc/varnish.vcl",
         "devops/varnish/Dockerfile",
     ],

diff --git a/...ging.interfaces.ICachePurgingSettings.xml → ...ging.interfaces.ICachePurgingSettings.xml b/...ging.interfaces.ICachePurgingSettings.xml → ...ging.interfaces.ICachePurgingSettings.xml
diff --git a/...one.caching.interfaces.ICacheSettings.xml → ...one.caching.interfaces.ICacheSettings.xml b/...one.caching.interfaces.ICacheSettings.xml → ...one.caching.interfaces.ICacheSettings.xml
diff --git a/sub/project_settings/cookiecutter.json b/sub/project_settings/cookiecutter.json
@@ -15,8 +15,8 @@
   "__container_registry_prefix": "{{ cookiecutter.container_registry | image_prefix }}",
   "__container_image_prefix": "{{ cookiecutter.__container_registry_prefix }}{{ cookiecutter.github_organization }}/{{ cookiecutter.project_slug }}",
   "__folder_name": "{{ cookiecutter.project_slug }}",
-  "__package_name": "{{ cookiecutter.python_package_name | package_name }}",
-  "__package_namespace": "{{ cookiecutter.python_package_name | package_namespace }}",
+  "__package_namespaces": "{{ cookiecutter.python_package_name | package_namespaces }}",
+  "__package_path": "{{ cookiecutter.python_package_name | package_path }}",
   "__profile_language": "{{ cookiecutter.language_code|gs_language_code }}",
   "__locales_language": "{{ cookiecutter.language_code|locales_language_code }}",
   "_copy_without_render": [],
@@ -28,8 +28,8 @@
     "cookieplone.filters.pascal_case",
     "cookieplone.filters.locales_language_code",
     "cookieplone.filters.gs_language_code",
-    "cookieplone.filters.package_name",
-    "cookieplone.filters.package_namespace",
+    "cookieplone.filters.package_namespaces",
+    "cookieplone.filters.package_path",
     "cookieplone.filters.latest_volto",
     "cookieplone.filters.latest_plone"
   ],

diff --git a/sub/project_settings/tests/test_cutter.py b/sub/project_settings/tests/test_cutter.py
@@ -33,27 +33,27 @@ def test_variable_substitution(build_files_list, variable_pattern, cutter_result
     "backend/requirements-docker.txt",
     "backend/scripts/create_site.py",
     "backend/setup.py",
-    "backend/src/project/title/locales/__init__.py",
-    "backend/src/project/title/locales/en/LC_MESSAGES/project.title.po",
-    "backend/src/project/title/locales/project.title.pot",
-    "backend/src/project/title/locales/update.py",
-    "backend/src/project/title/profiles/default/registry/plone.base.interfaces.controlpanel.IMailSchema.xml",  # noQA
-    "backend/src/project/title/profiles/default/registry/plone.base.interfaces.controlpanel.ISiteSchema.xml",  # noQA
-    "backend/src/project/title/profiles/default/registry/plone.i18n.interfaces.ILanguageSchema.xml",
-    "backend/src/project/title/profiles/initial/metadata.xml",
-    "backend/src/project/title/setuphandlers/examplecontent/.gitkeep",
-    "backend/src/project/title/setuphandlers/examplecontent/content/__metadata__.json",
-    "backend/src/project/title/setuphandlers/examplecontent/content/a58ccead718140c1baa98d43595fc3e6/data.json",
-    "backend/src/project/title/setuphandlers/examplecontent/content/a58ccead718140c1baa98d43595fc3e6/image/plone-foundation.png",
-    "backend/src/project/title/setuphandlers/examplecontent/content/a720393b3c0240e5bd27c43fcd2cfd1e/data.json",
-    "backend/src/project/title/setuphandlers/examplecontent/content/plone_site_root/data.json",
-    "backend/src/project/title/setuphandlers/examplecontent/discussions.json",
-    "backend/src/project/title/setuphandlers/examplecontent/portlets.json",
-    "backend/src/project/title/setuphandlers/examplecontent/principals.json",
-    "backend/src/project/title/setuphandlers/examplecontent/redirects.json",
-    "backend/src/project/title/setuphandlers/examplecontent/relations.json",
-    "backend/src/project/title/setuphandlers/examplecontent/translations.json",
-    "backend/src/project/title/setuphandlers/initial.py",
+    "backend/src/packagename/locales/__init__.py",
+    "backend/src/packagename/locales/en/LC_MESSAGES/project.title.po",
+    "backend/src/packagename/locales/project.title.pot",
+    "backend/src/packagename/locales/update.py",
+    "backend/src/packagename/profiles/default/registry/plone.base.interfaces.controlpanel.IMailSchema.xml",  # noQA
+    "backend/src/packagename/profiles/default/registry/plone.base.interfaces.controlpanel.ISiteSchema.xml",  # noQA
+    "backend/src/packagename/profiles/default/registry/plone.i18n.interfaces.ILanguageSchema.xml",
+    "backend/src/packagename/profiles/initial/metadata.xml",
+    "backend/src/packagename/setuphandlers/examplecontent/.gitkeep",
+    "backend/src/packagename/setuphandlers/examplecontent/content/__metadata__.json",
+    "backend/src/packagename/setuphandlers/examplecontent/content/a58ccead718140c1baa98d43595fc3e6/data.json",
+    "backend/src/packagename/setuphandlers/examplecontent/content/a58ccead718140c1baa98d43595fc3e6/image/plone-foundation.png",
+    "backend/src/packagename/setuphandlers/examplecontent/content/a720393b3c0240e5bd27c43fcd2cfd1e/data.json",
+    "backend/src/packagename/setuphandlers/examplecontent/content/plone_site_root/data.json",
+    "backend/src/packagename/setuphandlers/examplecontent/discussions.json",
+    "backend/src/packagename/setuphandlers/examplecontent/portlets.json",
+    "backend/src/packagename/setuphandlers/examplecontent/principals.json",
+    "backend/src/packagename/setuphandlers/examplecontent/redirects.json",
+    "backend/src/packagename/setuphandlers/examplecontent/relations.json",
+    "backend/src/packagename/setuphandlers/examplecontent/translations.json",
+    "backend/src/packagename/setuphandlers/initial.py",
     "frontend/.dockerignore",
     "frontend/Dockerfile",
     "frontend/Makefile",

diff --git a/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Makefile b/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Makefile
@@ -36,7 +36,7 @@ endif
 PLONE_SITE_ID=Plone
 BACKEND_FOLDER=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 PLONE_VERSION=$(shell cat $(BACKEND_FOLDER)/version.txt)
-EXAMPLE_CONTENT_FOLDER=${BACKEND_FOLDER}/src/{{ cookiecutter.__package_namespace }}/{{ cookiecutter.__package_name }}/setuphandlers/examplecontent
+EXAMPLE_CONTENT_FOLDER=${BACKEND_FOLDER}/src/{{ cookiecutter.__package_path }}/setuphandlers/examplecontent
 
 GIT_FOLDER=$(BACKEND_FOLDER)/.git
 VENV_FOLDER=$(BACKEND_FOLDER)/.venv
@@ -132,7 +132,7 @@ build-image:  ## Build Docker Images
 # Acceptance tests
 .PHONY: acceptance-backend-start
 acceptance-backend-start: ## Start backend acceptance server
-	ZSERVER_HOST=0.0.0.0 ZSERVER_PORT=55001 LISTEN_PORT=55001 APPLY_PROFILES="{{ cookiecutter.__package_namespace }}/{{ cookiecutter.__package_name }}:default" CONFIGURE_PACKAGES="plone.restapi,plone.volto,plone.volto.cors,{{ cookiecutter.__package_namespace }}/{{ cookiecutter.__package_name }}" $(BIN_FOLDER)/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING
+	ZSERVER_HOST=0.0.0.0 ZSERVER_PORT=55001 LISTEN_PORT=55001 APPLY_PROFILES="{{ cookiecutter.python_package_name }}:default" CONFIGURE_PACKAGES="plone.restapi,plone.volto,plone.volto.cors,{{ cookiecutter.python_package_name }}" $(BIN_FOLDER)/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING
 
 .PHONY: acceptance-image-build
 acceptance-image-build:  ## Build Docker Images

diff --git a/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/setup.py b/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/setup.py
@@ -43,7 +43,7 @@
     },
     license="GPL version 2",
     packages=find_packages("src", exclude=["ez_setup"]),
-    namespace_packages=["{{ cookiecutter.__package_namespace }}"],
+    namespace_packages=[{{ cookiecutter.__package_namespaces }}],
     package_dir={"": "src"},
     include_package_data=True,
     zip_safe=False,

diff --git a/...ter.__package_name }}/locales/__init__.py → ...ckend/src/packagename/locales/__init__.py b/...ter.__package_name }}/locales/__init__.py → ...ckend/src/packagename/locales/__init__.py
diff --git a/...utter.__package_name }}/locales/update.py → ...backend/src/packagename/locales/update.py b/...utter.__package_name }}/locales/update.py → ...backend/src/packagename/locales/update.py
diff --git a/...{{ cookiecutter.python_package_name }}.po → ...{{ cookiecutter.python_package_name }}.po b/...{{ cookiecutter.python_package_name }}.po → ...{{ cookiecutter.python_package_name }}.po
diff --git a/...{ cookiecutter.python_package_name }}.pot → ...{ cookiecutter.python_package_name }}.pot b/...{ cookiecutter.python_package_name }}.pot → ...{ cookiecutter.python_package_name }}.pot
diff --git a/...kiecutter.__package_name }}/profiles.zcml → ... }}/backend/src/packagename/profiles.zcml b/...kiecutter.__package_name }}/profiles.zcml → ... }}/backend/src/packagename/profiles.zcml
diff --git a/...e.interfaces.controlpanel.IMailSchema.xml → ...e.interfaces.controlpanel.IMailSchema.xml b/...e.interfaces.controlpanel.IMailSchema.xml → ...e.interfaces.controlpanel.IMailSchema.xml
diff --git a/...e.interfaces.controlpanel.ISiteSchema.xml → ...e.interfaces.controlpanel.ISiteSchema.xml b/...e.interfaces.controlpanel.ISiteSchema.xml → ...e.interfaces.controlpanel.ISiteSchema.xml
diff --git a/...plone.i18n.interfaces.ILanguageSchema.xml → ...plone.i18n.interfaces.ILanguageSchema.xml b/...plone.i18n.interfaces.ILanguageSchema.xml → ...plone.i18n.interfaces.ILanguageSchema.xml
diff --git a/...age_name }}/profiles/initial/metadata.xml → ...packagename/profiles/initial/metadata.xml b/...age_name }}/profiles/initial/metadata.xml → ...packagename/profiles/initial/metadata.xml
diff --git a/... }}/setuphandlers/examplecontent/.gitkeep → ...ame/setuphandlers/examplecontent/.gitkeep b/... }}/setuphandlers/examplecontent/.gitkeep → ...ame/setuphandlers/examplecontent/.gitkeep
diff --git a/.../examplecontent/content/__metadata__.json → .../examplecontent/content/__metadata__.json b/.../examplecontent/content/__metadata__.json → .../examplecontent/content/__metadata__.json
diff --git a/...58ccead718140c1baa98d43595fc3e6/data.json → ...58ccead718140c1baa98d43595fc3e6/data.json b/...58ccead718140c1baa98d43595fc3e6/data.json → ...58ccead718140c1baa98d43595fc3e6/data.json
diff --git a/...a98d43595fc3e6/image/plone-foundation.png → ...a98d43595fc3e6/image/plone-foundation.png b/...a98d43595fc3e6/image/plone-foundation.png → ...a98d43595fc3e6/image/plone-foundation.png
diff --git a/...720393b3c0240e5bd27c43fcd2cfd1e/data.json → ...720393b3c0240e5bd27c43fcd2cfd1e/data.json b/...720393b3c0240e5bd27c43fcd2cfd1e/data.json → ...720393b3c0240e5bd27c43fcd2cfd1e/data.json
diff --git a/...content/content/plone_site_root/data.json → ...content/content/plone_site_root/data.json b/...content/content/plone_site_root/data.json → ...content/content/plone_site_root/data.json
diff --git a/...phandlers/examplecontent/discussions.json → ...phandlers/examplecontent/discussions.json b/...phandlers/examplecontent/discussions.json → ...phandlers/examplecontent/discussions.json
diff --git a/...etuphandlers/examplecontent/portlets.json → ...etuphandlers/examplecontent/portlets.json b/...etuphandlers/examplecontent/portlets.json → ...etuphandlers/examplecontent/portlets.json
diff --git a/...uphandlers/examplecontent/principals.json → ...uphandlers/examplecontent/principals.json b/...uphandlers/examplecontent/principals.json → ...uphandlers/examplecontent/principals.json
diff --git a/...tuphandlers/examplecontent/redirects.json → ...tuphandlers/examplecontent/redirects.json b/...tuphandlers/examplecontent/redirects.json → ...tuphandlers/examplecontent/redirects.json
diff --git a/...tuphandlers/examplecontent/relations.json → ...tuphandlers/examplecontent/relations.json b/...tuphandlers/examplecontent/relations.json → ...tuphandlers/examplecontent/relations.json
diff --git a/...handlers/examplecontent/translations.json → ...handlers/examplecontent/translations.json b/...handlers/examplecontent/translations.json → ...handlers/examplecontent/translations.json
diff --git a/..._package_name }}/setuphandlers/initial.py → .../src/packagename/setuphandlers/initial.py b/..._package_name }}/setuphandlers/initial.py → .../src/packagename/setuphandlers/initial.py