Test backend/requirements-docker.txt updating relstorage/psycopg2 ver…

…sions.

Update to Plone 6.0.10.1.
Sync requirements-bootstrap.txt
Add collective.revisionmanager 1.2.2.
Update instance.yaml for cookiecutter-zope-instance

CHANGELOG.md

@@ -1,5 +1,16 @@
 ## 1.0.17 (unreleased)
 
+
+- Pin cookiecutter-zope-instance version in backend/Makefile. [fredvd]
+
+- Update instance(-filstorage).yaml to remove deprecated load_zcml. [fredvd]
+
+- Test backend/requirements-docker.txt updating relstorage/psycopg2 versions. [fredvd]
+
+- Update to Plone 6.0.10.1. Sync requirements-bootstrap.txt[fredvd]
+
+- Add collective.revisionmanager 1.2.2. [fredvd]
+
 - Add volto-fullcalendar-block [fredvd]
 
 - Add recurrence index to catalog.xml [fredvd]

backend/Dockerfile

@@ -1,6 +1,6 @@
-ARG PLONE_VERSION=6.0.9
+ARG PLONE_VERSION=6.0.10.1
 FROM plone/plone-backend:${PLONE_VERSION}
-ARG PLONE_VERSION=6.0.9
+ARG PLONE_VERSION=6.0.10.1
 
 LABEL maintainer="Plone Foundation <[email protected]>" \
       org.label-schema.name="plone.org-backend" \

backend/Makefile

@@ -88,19 +88,17 @@ clean-test: ## remove test and coverage artifacts
 bin/pip:
 	@echo "$(GREEN)==> Setup Virtual Env$(RESET)"
 	$(PYTHON) -m venv .
-	bin/pip install -U -r requirements-bootstrap.txt -c constraints-mxdev.txt
+	bin/pip install -U -r requirements-bootstrap.txt
 
 .PHONY: config
 config: bin/pip  ## Create instance configuration
 	@echo "$(GREEN)==> Create instance configuration$(RESET)"
-	bin/cookiecutter -f --no-input --config-file instance.yaml gh:plone/cookiecutter-zope-instance
+	bin/cookiecutter -f --no-input --config-file instance.yaml --checkout 2.1.0 gh:plone/cookiecutter-zope-instance
 
 .PHONY: config-fs
 config-fs: bin/pip  ## Create instance configuration
 	@echo "$(GREEN)==> Create instance configuration$(RESET)"
-	bin/cookiecutter -f --no-input --config-file instance-filestorage.yaml gh:plone/cookiecutter-zope-instance
-
-
+	bin/cookiecutter -f --no-input --config-file instance-filestorage.yaml --checkout 2.1.0 gh:plone/cookiecutter-zope-instance
 
 # i18n
 bin/i18ndude: bin/pip

backend/constraints.txt

@@ -1 +1 @@
--c https://dist.plone.org/release/6.0.9/constraints.txt
+-c https://dist.plone.org/release/6.0.10.1/constraints.txt

backend/instance-filestorage.yaml

@@ -1,13 +1,8 @@
 default_context:
     initial_user_name: 'admin'
-    initial_user_password: 'admin'
-
-    load_zcml:
-        package_includes: ['ploneorg']
-
+    initial_user_password: 'adminadmin'
+    zcml_package_includes: ploneorg, collective.revisionmanager
     dos_protection_available: true
-
     db_storage: direct
-
     db_filestorage_location: ../data/filestorage/Data.fs
     db_blobs_location: ../data/blobs

backend/instance.yaml

@@ -1,12 +1,8 @@
 default_context:
     initial_user_name: 'admin'
-    initial_user_password: 'admin'
-
-    load_zcml:
-        package_includes: ['ploneorg']
-
+    initial_user_password: 'adminadmin'
+    zcml_package_includes: ploneorg
     dos_protection_available: true
-
     db_storage: relstorage
     db_relstorage_postgresql_driver: psycopg2
     db_relstorage_postgresql_dsn: dbname='ploneorg' user='ploneorg' host='127.0.0.1' password='ploneorg'

backend/mx.ini

@@ -8,9 +8,7 @@
 ; version-overrides =
 ;     example.package==2.1.0a2
 
-version-overrides = 
-     pip==23.3.2
-     mxdev==3.1.0
+;version-overrides = 
 
 [plone.app.vulnerabilities]
 url = https://github.com/plone/plone.app.vulnerabilities.git

backend/requirements-bootstrap.txt

@@ -1,7 +1,8 @@
 # These packages are installed after creating the virtualenv and are needed to further configure and
 # install the main backend application. Keep these versions pinned and add possible subdependencies
-pip==23.3.2
+# We cannoot use the generated constraints-mxdev.txt because it doesn't exist when bootstrapping
+pip==24.0
 wheel==0.42.0
-cookiecutter==2.5.0
 mxdev==3.1.0
+cookiecutter==2.6.0
 prettyconf==2.2.1

backend/requirements-docker.txt

@@ -1,2 +1,6 @@
 -c constraints.txt
 -e src/ploneorg
+
+relstorage==4.0.0
+psycopg2==2.9.9
+collective.revisionmanager==1.2.2

backend/requirements.txt

@@ -3,4 +3,5 @@
 
 relstorage==4.0.0
 psycopg2==2.9.9
+collective.revisionmanager==1.2.2
 zope.testrunner

backend/src/ploneorg/setup.py

@@ -57,6 +57,7 @@
         "collective.volto.secondarymenu",
         "collective.volto.socialsettings",
         "collective.casestudy",
+        "collective.revisionmanager",
     ],
     extras_require={
         "test": [

backend/version.txt

@@ -1 +1 @@
-6.0.9
+6.0.10.1