rename cookiecutter settings.

OnroerendErfgoed · Jun 27, 2024 · 24f8c30 · 24f8c30
1 parent 99af800
commit 24f8c30
Show file tree

Hide file tree

Showing 65 changed files with 38 additions and 52 deletions.
diff --git a/atramhasis/static/package-lock.json b/atramhasis/static/package-lock.json
diff --git a/cookiecutters/demo/cookiecutter.json b/cookiecutters/demo/cookiecutter.json
@@ -1,6 +1,5 @@
 {
-    "repo": "atramhasis_demo",
-    "package": "atramhasis_demo",
-    "package_logger": "atramhasis_demo_logger",
-    "project": "atramhasis-demo"
+    "root_folder": "atramhasis_demo",
+    "python_package": "atramhasis_demo",
+    "package_logger": "demo_logger"
 } 
diff --git a/cookiecutters/demo/{{cookiecutter.repo}}/MANIFEST.in b/cookiecutters/demo/{{cookiecutter.repo}}/MANIFEST.in
diff --git a/...iecutter.repo}}/{{cookiecutter.package}}/static/scss/_{{cookiecutter.package}}-admin.scss b/...iecutter.repo}}/{{cookiecutter.package}}/static/scss/_{{cookiecutter.package}}-admin.scss
diff --git a/...utter.repo}}/{{cookiecutter.package}}/static/scss/_{{cookiecutter.package}}-settings.scss b/...utter.repo}}/{{cookiecutter.package}}/static/scss/_{{cookiecutter.package}}-settings.scss
diff --git a/...{{cookiecutter.repo}}/{{cookiecutter.package}}/static/scss/_{{cookiecutter.package}}.scss b/...{{cookiecutter.repo}}/{{cookiecutter.package}}/static/scss/_{{cookiecutter.package}}.scss
diff --git a/...rs/demo/{{cookiecutter.repo}}/CHANGES.txt → .../{{cookiecutter.root_folder}}/CHANGES.txt b/...rs/demo/{{cookiecutter.repo}}/CHANGES.txt → .../{{cookiecutter.root_folder}}/CHANGES.txt
diff --git a/cookiecutters/demo/{{cookiecutter.root_folder}}/MANIFEST.in b/cookiecutters/demo/{{cookiecutter.root_folder}}/MANIFEST.in
@@ -0,0 +1,2 @@
+include *.txt *.ini *.cfg *.rst
+recursive-include {{cookiecutter.python_package}} *.ico *.png *.css *.gif *.jpg *.pt *.txt *.jinja2 *.js *.html *.xml
diff --git a/...ers/demo/{{cookiecutter.repo}}/README.rst → ...o/{{cookiecutter.root_folder}}/README.rst b/...ers/demo/{{cookiecutter.repo}}/README.rst → ...o/{{cookiecutter.root_folder}}/README.rst
@@ -1,3 +1,3 @@
-{{cookiecutter.project}} README
+{{cookiecutter.python_package}} README
 
 This is an Atramhasis demo application
diff --git a/...rs/demo/{{cookiecutter.repo}}/alembic.ini → .../{{cookiecutter.root_folder}}/alembic.ini b/...rs/demo/{{cookiecutter.repo}}/alembic.ini → .../{{cookiecutter.root_folder}}/alembic.ini
diff --git a/...emo/{{cookiecutter.repo}}/development.ini → ...ookiecutter.root_folder}}/development.ini b/...emo/{{cookiecutter.repo}}/development.ini → ...ookiecutter.root_folder}}/development.ini
@@ -4,7 +4,7 @@
 ###
 
 [app:main]
-use = egg:{{cookiecutter.project}}
+use = egg:{{cookiecutter.python_package}}
 
 pyramid.reload_templates = true
 pyramid.debug_authorization = false
@@ -16,18 +16,18 @@ pyramid.includes =
     pyramid_tm
 jinja2.directories =
 	atramhasis:templates
-    {{cookiecutter.package}}:templates
+    {{cookiecutter.python_package}}:templates
 jinja2.extensions =
     jinja2.ext.do
 jinja2.filters =
     label_sort = atramhasis.utils.label_sort
 available_languages = en nl fr
-sqlalchemy.url = sqlite:///%(here)s/{{cookiecutter.package}}.sqlite
+sqlalchemy.url = sqlite:///%(here)s/{{cookiecutter.python_package}}.sqlite
 
 atramhasis.session_factory.secret = test123
 
 skosprovider.skosregistry_location = request
-skosprovider.skosregistry_factory = {{cookiecutter.package}}.skos.create_registry
+skosprovider.skosregistry_factory = {{cookiecutter.python_package}}.skos.create_registry
 
 jinja2.i18n.domain = atramhasis
 
@@ -117,7 +117,7 @@ qualname = sqlalchemy.engine
 [logger_{{cookiecutter.package_logger}}]
 level = DEBUG
 handlers =
-qualname = {{cookiecutter.package}}
+qualname = {{cookiecutter.python_package}}
 
 [handler_console]
 class = StreamHandler

diff --git a/...demo/{{cookiecutter.repo}}/pyproject.toml → ...cookiecutter.root_folder}}/pyproject.toml b/...demo/{{cookiecutter.repo}}/pyproject.toml → ...cookiecutter.root_folder}}/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["hatchling", "hatch-fancy-pypi-readme"]
 build-backend = "hatchling.build"
 
 [project]
-name = "My atramhasis"
+name = "{{ cookiecutter.python_package }}"
 description = "My atramhasis setup"
 version = "0.0.1"
 
@@ -21,7 +21,7 @@ dev = [
 ]
 
 [project.entry-points."paste.app_factory"]
-main = "{{ cookiecutter.package }}:main"
+main = "{{ cookiecutter.python_package }}:main"
 
 [tool.hatch.metadata.hooks.fancy-pypi-readme]
 content-type = "text/x-rst"

diff --git a/...{cookiecutter.repo}}/requirements-dev.txt → ...cutter.root_folder}}/requirements-dev.txt b/...{cookiecutter.repo}}/requirements-dev.txt → ...cutter.root_folder}}/requirements-dev.txt
diff --git a/...mo/{{cookiecutter.repo}}/requirements.txt → ...okiecutter.root_folder}}/requirements.txt b/...mo/{{cookiecutter.repo}}/requirements.txt → ...okiecutter.root_folder}}/requirements.txt
diff --git a/...po}}/{{cookiecutter.package}}/__init__.py → ...er}}/{{cookiecutter.package}}/__init__.py b/...po}}/{{cookiecutter.package}}/__init__.py → ...er}}/{{cookiecutter.package}}/__init__.py
@@ -39,12 +39,12 @@ def main(global_config, **settings):
     config.include("atramhasis:data.db")
 
     # Set up translations
-    config.add_translation_dirs("{{cookiecutter.package}}:locale/")
+    config.add_translation_dirs("{{cookiecutter.python_package}}:locale/")
 
     # Override assets
     config.override_asset(
         to_override="atramhasis:static/",
-        override_with="{{cookiecutter.package}}:static/",
+        override_with="{{cookiecutter.python_package}}:static/",
     )
     # Add atramhasis static folder
     config.add_static_view(

diff --git a/...{cookiecutter.package}}/event_handlers.py → ...{cookiecutter.package}}/event_handlers.py b/...{cookiecutter.package}}/event_handlers.py → ...{cookiecutter.package}}/event_handlers.py
diff --git a/...kiecutter.package}}/locale/atramhasis.pot → ...kiecutter.package}}/locale/atramhasis.pot b/...kiecutter.package}}/locale/atramhasis.pot → ...kiecutter.package}}/locale/atramhasis.pot
diff --git a/...age}}/locale/en/LC_MESSAGES/atramhasis.mo → ...age}}/locale/en/LC_MESSAGES/atramhasis.mo b/...age}}/locale/en/LC_MESSAGES/atramhasis.mo → ...age}}/locale/en/LC_MESSAGES/atramhasis.mo
diff --git a/...age}}/locale/en/LC_MESSAGES/atramhasis.po → ...age}}/locale/en/LC_MESSAGES/atramhasis.po b/...age}}/locale/en/LC_MESSAGES/atramhasis.po → ...age}}/locale/en/LC_MESSAGES/atramhasis.po
diff --git a/...age}}/locale/fr/LC_MESSAGES/atramhasis.mo → ...age}}/locale/fr/LC_MESSAGES/atramhasis.mo b/...age}}/locale/fr/LC_MESSAGES/atramhasis.mo → ...age}}/locale/fr/LC_MESSAGES/atramhasis.mo
diff --git a/...age}}/locale/fr/LC_MESSAGES/atramhasis.po → ...age}}/locale/fr/LC_MESSAGES/atramhasis.po b/...age}}/locale/fr/LC_MESSAGES/atramhasis.po → ...age}}/locale/fr/LC_MESSAGES/atramhasis.po
diff --git a/...age}}/locale/nl/LC_MESSAGES/atramhasis.mo → ...age}}/locale/nl/LC_MESSAGES/atramhasis.mo b/...age}}/locale/nl/LC_MESSAGES/atramhasis.mo → ...age}}/locale/nl/LC_MESSAGES/atramhasis.mo
diff --git a/...age}}/locale/nl/LC_MESSAGES/atramhasis.po → ...age}}/locale/nl/LC_MESSAGES/atramhasis.po b/...age}}/locale/nl/LC_MESSAGES/atramhasis.po → ...age}}/locale/nl/LC_MESSAGES/atramhasis.po
diff --git a/...{{cookiecutter.package}}/skos/__init__.py → ...{{cookiecutter.package}}/skos/__init__.py b/...{{cookiecutter.package}}/skos/__init__.py → ...{{cookiecutter.package}}/skos/__init__.py
diff --git a/...}/{{cookiecutter.package}}/static/Gemfile → ...}/{{cookiecutter.package}}/static/Gemfile b/...}/{{cookiecutter.package}}/static/Gemfile → ...}/{{cookiecutter.package}}/static/Gemfile
diff --git a/...{{cookiecutter.package}}/static/config.rb → ...{{cookiecutter.package}}/static/config.rb b/...{{cookiecutter.package}}/static/config.rb → ...{{cookiecutter.package}}/static/config.rb
diff --git a/...cutter.package}}/static/css/app-admin.css → ...cutter.package}}/static/css/app-admin.css b/...cutter.package}}/static/css/app-admin.css → ...cutter.package}}/static/css/app-admin.css
diff --git a/...cookiecutter.package}}/static/css/app.css → ...cookiecutter.package}}/static/css/app.css b/...cookiecutter.package}}/static/css/app.css → ...cookiecutter.package}}/static/css/app.css
diff --git a/...okiecutter.package}}/static/css/print.css → ...okiecutter.package}}/static/css/print.css b/...okiecutter.package}}/static/css/print.css → ...okiecutter.package}}/static/css/print.css
diff --git a/...utter.package}}/static/css/schemetree.css → ...utter.package}}/static/css/schemetree.css b/...utter.package}}/static/css/schemetree.css → ...utter.package}}/static/css/schemetree.css
diff --git a/...ookiecutter.package}}/static/img/.gitkeep → ...ookiecutter.package}}/static/img/.gitkeep b/...ookiecutter.package}}/static/img/.gitkeep → ...ookiecutter.package}}/static/img/.gitkeep
diff --git a/...cutter.package}}/static/img/atramlogo.png → ...cutter.package}}/static/img/atramlogo.png b/...cutter.package}}/static/img/atramlogo.png → ...cutter.package}}/static/img/atramlogo.png
diff --git a/...iecutter.package}}/static/img/favicon.ico → ...iecutter.package}}/static/img/favicon.ico b/...iecutter.package}}/static/img/favicon.ico → ...iecutter.package}}/static/img/favicon.ico
diff --git a/...iecutter.package}}/static/img/headimg.png → ...iecutter.package}}/static/img/headimg.png b/...iecutter.package}}/static/img/headimg.png → ...iecutter.package}}/static/img/headimg.png
diff --git a/...ecutter.package}}/static/img/listitem.png → ...ecutter.package}}/static/img/listitem.png b/...ecutter.package}}/static/img/listitem.png → ...ecutter.package}}/static/img/listitem.png
diff --git a/...{{cookiecutter.package}}/static/js/app.js → ...{{cookiecutter.package}}/static/js/app.js b/...{{cookiecutter.package}}/static/js/app.js → ...{{cookiecutter.package}}/static/js/app.js
diff --git a/...okiecutter.package}}/static/js/concept.js → ...okiecutter.package}}/static/js/concept.js b/...okiecutter.package}}/static/js/concept.js → ...okiecutter.package}}/static/js/concept.js
diff --git a/...cutter.package}}/static/package-lock.json → ...cutter.package}}/static/package-lock.json b/...cutter.package}}/static/package-lock.json → ...cutter.package}}/static/package-lock.json
diff --git a/...ookiecutter.package}}/static/package.json → ...ookiecutter.package}}/static/package.json b/...ookiecutter.package}}/static/package.json → ...ookiecutter.package}}/static/package.json
diff --git a/...r.root_folder}}/{{cookiecutter.package}}/static/scss/_{{cookiecutter.package}}-admin.scss b/...r.root_folder}}/{{cookiecutter.package}}/static/scss/_{{cookiecutter.package}}-admin.scss
@@ -0,0 +1 @@
+// Custom SASS code for {{cookiecutter.python_package}}-admin
diff --git a/...oot_folder}}/{{cookiecutter.package}}/static/scss/_{{cookiecutter.package}}-settings.scss b/...oot_folder}}/{{cookiecutter.package}}/static/scss/_{{cookiecutter.package}}-settings.scss
@@ -0,0 +1 @@
+// Custom SASS code for {{cookiecutter.python_package}}-settings
diff --git a/...ecutter.root_folder}}/{{cookiecutter.package}}/static/scss/_{{cookiecutter.package}}.scss b/...ecutter.root_folder}}/{{cookiecutter.package}}/static/scss/_{{cookiecutter.package}}.scss
@@ -0,0 +1 @@
+// Custom SASS code for {{cookiecutter.python_package}}
diff --git a/...tter.package}}/static/scss/app-admin.scss → ...tter.package}}/static/scss/app-admin.scss b/...tter.package}}/static/scss/app-admin.scss → ...tter.package}}/static/scss/app-admin.scss
@@ -1,6 +1,6 @@
 @import "atramhasis/settings";
 @import "atramhasis/atramhasis-settings";
-@import "{{cookiecutter.package}}-settings";
+@import "{{cookiecutter.python_package}}-settings";
 @import "foundation";
 @import "font-awesome";
 @import "atramhasis/atramhasis-header";
@@ -12,4 +12,4 @@
 @import "atramhasis/atramhasis-mquery";
 @import "atramhasis/atramhasis-forms";
 @import "atramhasis/atramhasis-admin";
-@import "{{cookiecutter.package}}-admin";
+@import "{{cookiecutter.python_package}}-admin";
diff --git a/...okiecutter.package}}/static/scss/app.scss → ...okiecutter.package}}/static/scss/app.scss b/...okiecutter.package}}/static/scss/app.scss → ...okiecutter.package}}/static/scss/app.scss
@@ -1,6 +1,6 @@
 @import "atramhasis/settings";
 @import "atramhasis/atramhasis-settings";
-@import "{{cookiecutter.package}}-settings";
+@import "{{cookiecutter.python_package}}-settings";
 @import "foundation";
 @import "font-awesome";
 @import "atramhasis/atramhasis-header";
@@ -11,4 +11,4 @@
 @import "atramhasis/atramhasis-article";
 //@import "atramhasis/atramhasis-topbar";
 @import "atramhasis/atramhasis-mquery";
-@import "{{cookiecutter.package}}";
+@import "{{cookiecutter.python_package}}";
diff --git a/...ic/scss/atramhasis/_atramhasis-admin.scss → ...ic/scss/atramhasis/_atramhasis-admin.scss b/...ic/scss/atramhasis/_atramhasis-admin.scss → ...ic/scss/atramhasis/_atramhasis-admin.scss
diff --git a/.../scss/atramhasis/_atramhasis-article.scss → .../scss/atramhasis/_atramhasis-article.scss b/.../scss/atramhasis/_atramhasis-article.scss → .../scss/atramhasis/_atramhasis-article.scss
diff --git a/...c/scss/atramhasis/_atramhasis-custom.scss → ...c/scss/atramhasis/_atramhasis-custom.scss b/...c/scss/atramhasis/_atramhasis-custom.scss → ...c/scss/atramhasis/_atramhasis-custom.scss
diff --git a/...c/scss/atramhasis/_atramhasis-footer.scss → ...c/scss/atramhasis/_atramhasis-footer.scss b/...c/scss/atramhasis/_atramhasis-footer.scss → ...c/scss/atramhasis/_atramhasis-footer.scss
diff --git a/...ic/scss/atramhasis/_atramhasis-forms.scss → ...ic/scss/atramhasis/_atramhasis-forms.scss b/...ic/scss/atramhasis/_atramhasis-forms.scss → ...ic/scss/atramhasis/_atramhasis-forms.scss
diff --git a/...c/scss/atramhasis/_atramhasis-header.scss → ...c/scss/atramhasis/_atramhasis-header.scss b/...c/scss/atramhasis/_atramhasis-header.scss → ...c/scss/atramhasis/_atramhasis-header.scss
diff --git a/...tic/scss/atramhasis/_atramhasis-home.scss → ...tic/scss/atramhasis/_atramhasis-home.scss b/...tic/scss/atramhasis/_atramhasis-home.scss → ...tic/scss/atramhasis/_atramhasis-home.scss
diff --git a/...ic/scss/atramhasis/_atramhasis-icons.scss → ...ic/scss/atramhasis/_atramhasis-icons.scss b/...ic/scss/atramhasis/_atramhasis-icons.scss → ...ic/scss/atramhasis/_atramhasis-icons.scss
diff --git a/...c/scss/atramhasis/_atramhasis-mquery.scss → ...c/scss/atramhasis/_atramhasis-mquery.scss b/...c/scss/atramhasis/_atramhasis-mquery.scss → ...c/scss/atramhasis/_atramhasis-mquery.scss
diff --git a/...scss/atramhasis/_atramhasis-settings.scss → ...scss/atramhasis/_atramhasis-settings.scss b/...scss/atramhasis/_atramhasis-settings.scss → ...scss/atramhasis/_atramhasis-settings.scss
diff --git a/...c/scss/atramhasis/_atramhasis-topbar.scss → ...c/scss/atramhasis/_atramhasis-topbar.scss b/...c/scss/atramhasis/_atramhasis-topbar.scss → ...c/scss/atramhasis/_atramhasis-topbar.scss
diff --git a/...e}}/static/scss/atramhasis/_settings.scss → ...e}}/static/scss/atramhasis/_settings.scss b/...e}}/static/scss/atramhasis/_settings.scss → ...e}}/static/scss/atramhasis/_settings.scss
diff --git a/...css/atramhasis/foundation/_functions.scss → ...css/atramhasis/foundation/_functions.scss b/...css/atramhasis/foundation/_functions.scss → ...css/atramhasis/foundation/_functions.scss
diff --git a/cookiecutters/scaffold/cookiecutter.json b/cookiecutters/scaffold/cookiecutter.json
@@ -1,6 +1,5 @@
 {
-    "repo": "atramhasis_demo",
-    "package": "atramhasis_demo",
-    "package_logger": "demo_logger",
-    "project": "atramhasis-demo"
+    "root_folder": "atramhasis_demo",
+    "python_package": "atramhasis_demo",
+    "package_logger": "demo_logger"
 } 
diff --git a/cookiecutters/scaffold/{{cookiecutter.repo}}/README.rst b/cookiecutters/scaffold/{{cookiecutter.repo}}/README.rst
diff --git a/...caffold/{{cookiecutter.repo}}/CHANGES.txt → .../{{cookiecutter.root_folder}}/CHANGES.txt b/...caffold/{{cookiecutter.repo}}/CHANGES.txt → .../{{cookiecutter.root_folder}}/CHANGES.txt
diff --git a/cookiecutters/scaffold/{{cookiecutter.root_folder}}/README.rst b/cookiecutters/scaffold/{{cookiecutter.root_folder}}/README.rst
@@ -0,0 +1,3 @@
+{{cookiecutter.python_package}} README
+
+this is just a scaffold
diff --git a/...caffold/{{cookiecutter.repo}}/alembic.ini → .../{{cookiecutter.root_folder}}/alembic.ini b/...caffold/{{cookiecutter.repo}}/alembic.ini → .../{{cookiecutter.root_folder}}/alembic.ini
diff --git a/...old/{{cookiecutter.repo}}/development.ini → ...ookiecutter.root_folder}}/development.ini b/...old/{{cookiecutter.repo}}/development.ini → ...ookiecutter.root_folder}}/development.ini
@@ -1,5 +1,5 @@
 [app:main]
-use = egg:my_atra
+use = egg:{{ cookiecutter.python_package }}
 
 sqlalchemy.url = sqlite:///%(here)s/atra.db
 

diff --git a/...fold/{{cookiecutter.repo}}/pyproject.toml → ...cookiecutter.root_folder}}/pyproject.toml b/...fold/{{cookiecutter.repo}}/pyproject.toml → ...cookiecutter.root_folder}}/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
-name = "My atramhasis"
+name = "{{ cookiecutter.python_package }}"
 description = "My atramhasis setup"
 version = "0.0.1"
 
@@ -18,4 +18,4 @@ dev = [
 ]
 
 [project.entry-points."paste.app_factory"]
-main = "{{ cookiecutter.package }}:main"
+main = "{{ cookiecutter.python_package }}:main"
diff --git a/...po}}/{{cookiecutter.package}}/__init__.py → ...er}}/{{cookiecutter.package}}/__init__.py b/...po}}/{{cookiecutter.package}}/__init__.py → ...er}}/{{cookiecutter.package}}/__init__.py