From 15017f2815e47c6765e01835c44083f164af6707 Mon Sep 17 00:00:00 2001 From: Fred van Dijk Date: Wed, 27 Mar 2024 17:59:37 +0100 Subject: [PATCH] Test backend/requirements-docker.txt updating relstorage/psycopg2 versions. 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 | 11 +++++++++++ backend/Dockerfile | 4 ++-- backend/Makefile | 8 +++----- backend/constraints.txt | 2 +- backend/instance-filestorage.yaml | 9 ++------- backend/instance.yaml | 8 ++------ backend/mx.ini | 4 +--- backend/requirements-bootstrap.txt | 5 +++-- backend/requirements-docker.txt | 4 ++++ backend/requirements.txt | 1 + backend/src/ploneorg/setup.py | 1 + backend/version.txt | 2 +- 12 files changed, 32 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 733f3e3..b50dcae 100644 --- a/CHANGELOG.md +++ b/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] diff --git a/backend/Dockerfile b/backend/Dockerfile index 5cac8cc..ffd949e 100644 --- a/backend/Dockerfile +++ b/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 " \ org.label-schema.name="plone.org-backend" \ diff --git a/backend/Makefile b/backend/Makefile index 8562816..d918a51 100644 --- a/backend/Makefile +++ b/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 diff --git a/backend/constraints.txt b/backend/constraints.txt index cac72d1..c6e1eb9 100644 --- a/backend/constraints.txt +++ b/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 diff --git a/backend/instance-filestorage.yaml b/backend/instance-filestorage.yaml index 99c749d..0cbfd9e 100644 --- a/backend/instance-filestorage.yaml +++ b/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 \ No newline at end of file diff --git a/backend/instance.yaml b/backend/instance.yaml index 879ba1d..d9378b8 100644 --- a/backend/instance.yaml +++ b/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' diff --git a/backend/mx.ini b/backend/mx.ini index 73a7184..520b432 100644 --- a/backend/mx.ini +++ b/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 diff --git a/backend/requirements-bootstrap.txt b/backend/requirements-bootstrap.txt index 5789843..240d3f4 100644 --- a/backend/requirements-bootstrap.txt +++ b/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 diff --git a/backend/requirements-docker.txt b/backend/requirements-docker.txt index ad40815..dc41c6b 100644 --- a/backend/requirements-docker.txt +++ b/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 \ No newline at end of file diff --git a/backend/requirements.txt b/backend/requirements.txt index 3a195be..75c8489 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -3,4 +3,5 @@ relstorage==4.0.0 psycopg2==2.9.9 +collective.revisionmanager==1.2.2 zope.testrunner diff --git a/backend/src/ploneorg/setup.py b/backend/src/ploneorg/setup.py index 8ce930a..44b2c32 100644 --- a/backend/src/ploneorg/setup.py +++ b/backend/src/ploneorg/setup.py @@ -57,6 +57,7 @@ "collective.volto.secondarymenu", "collective.volto.socialsettings", "collective.casestudy", + "collective.revisionmanager", ], extras_require={ "test": [ diff --git a/backend/version.txt b/backend/version.txt index f1bb5eb..3537eb6 100644 --- a/backend/version.txt +++ b/backend/version.txt @@ -1 +1 @@ -6.0.9 +6.0.10.1 \ No newline at end of file