Merge branch 'main' into content-review

Author: jnptk

.gitignore

@@ -1,3 +1,4 @@
 !.vscode
 /scripts
-.DS_Store
+.DS_Store
+/data

Makefile

@@ -123,6 +123,14 @@ install:  ## Install
 	$(MAKE) backend-install
 	$(MAKE) frontend-install
 
+.PHONY: upgrade
+upgrade:  ## Upgrade dependencies
+	@echo "Upgrade dependencies"
+	@uvx repoplone deps upgrade backend
+	@uvx repoplone deps upgrade frontend
+	$(MAKE) -C "./backend/" upgrade
+	$(MAKE) -C "./frontend/" upgrade
+
 .PHONY: start
 start:  ## Start
 	@echo "Starting application"

backend/.gitignore

@@ -44,6 +44,7 @@ var/
 .installed.txt
 .lock
 constraints.txt
+instance-local.yaml
 requirements.txt
 requirements.lock
 .pytest_cache

backend/Makefile

@@ -54,9 +54,14 @@ all: build
 help: ## This help message
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
-instance/etc/zope.ini instance/etc/zope.conf: ## Create instance configuration
+instance/etc/zope.ini instance/etc/zope.conf: instance.yaml ## Create instance configuration
 	@echo "$(GREEN)==> Create instance configuration$(RESET)"
-	@uvx cookiecutter -f --no-input --config-file instance.yaml gh:plone/cookiecutter-zope-instance
+	if [[ -s instance-local.yaml ]]; then \
+		echo ">>> Using instance-local.yaml"; \
+		uvx cookiecutter -f --no-input --config-file instance-local.yaml gh:plone/cookiecutter-zope-instance; \
+	else \
+		uvx cookiecutter -f --no-input --config-file instance.yaml gh:plone/cookiecutter-zope-instance; \
+	fi
 
 .PHONY: config
 config: instance/etc/zope.ini
@@ -65,15 +70,17 @@ config: instance/etc/zope.ini
 sync: ## Sync project dependencies
 	@echo "$(GREEN)==> Sync project dependencies$(RESET)"
 	@uv sync
-	@echo "$(GREEN)==> Force update of kitconcept.voltolighttheme and kitconcept.core$(RESET)"
-	@uv sync --upgrade-package kitconcept.core
-	@uv sync --upgrade-package kitconcept.voltolighttheme
 
 .PHONY: install
 install: sync config ## Install Plone and dependencies
 
 $(VENV_FOLDER): sync ## Install Plone and dependencies
 
+.PHONY: upgrade
+upgrade: ## Force upgrade of kitconcept.voltolighttheme
+	@echo "$(GREEN)==> Force update of dependencies$(RESET)"
+	@uv sync --upgrade-package kitconcept.voltolighttheme
+
 .PHONY: clean
 clean: ## Clean environment
 	@echo "$(RED)==> Cleaning environment and build$(RESET)"

backend/instance-local.yaml.example

@@ -0,0 +1,6 @@
+default_context:
+    initial_user_password: 'admin'
+    zcml_package_includes: 'kitconcept.intranet'
+    db_storage: direct
+    db_filestorage_location: ../data/filestorage/Data.fs
+    db_blobs_location: ../data/blobstorage

backend/news/225.internal

@@ -0,0 +1 @@
+Support optional instance-local.yaml in the backed to override cookiecutter zope settings on a development install. @fredvd

backend/news/333.feature

@@ -0,0 +1 @@
+Added command for upgrading dependencies. @davisagli @sneridagh

backend/news/338.internal

@@ -0,0 +1 @@
+Improve example content of Personalized Listings @iRohitSingh

backend/pyproject.toml

@@ -17,15 +17,15 @@ classifiers = [
     "Development Status :: 3 - Alpha",
     "Environment :: Web Environment",
     "Framework :: Plone",
-    "Framework :: Plone :: 6.1",
     "Framework :: Plone :: Distribution",
     "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3.12",
+    "Framework :: Plone :: 6.1",
 ]
 dependencies = [
-    "kitconcept.core==2.0.0a9",
+    "kitconcept.core==2.0.0a10",
     "plone.api",
     "plone.app.discussion",
     "plone.app.querystring>=3.0.0a2",
@@ -295,7 +295,7 @@ constraint-dependencies = [
     "jsonschema-specifications==2025.9.1",
     "jsonschema==4.24.1",
     "keyring==25.6.0",
-    "kitconcept.core==2.0.0a9",
+    "kitconcept.core==2.0.0a10",
     "kitconcept.solr==2.0.0a9",
     "kitconcept.voltolighttheme>=8.0.0a9",
     "legacy-cgi==2.6.2",
@@ -395,7 +395,7 @@ constraint-dependencies = [
     "plone.dexterity==3.0.8",
     "plone.distribution==3.2.1",
     "plone.event==2.0.3",
-    "plone.exportimport==1.3.1",
+    "plone.exportimport>=2.0.0a2",
     "plone.folder==4.0.1",
     "plone.formwidget.autocomplete==1.5.0",
     "plone.formwidget.namedfile==3.1.2",