From d82800efda2fdcad861887600b4cc34cb851f53d Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Wed, 18 Sep 2024 14:20:37 +0200 Subject: [PATCH] upgrade to plone 6.0.13 (#82) * upgrade to plone 6.0.11.1 * cleanup dos_protection hack removed * plone 6.0.12 * fix buildout * test * py311 * remove design.* from tests * remove tests for plone.app.portlets * remove design.* tests --- .github/workflows/buildout.yml | 2 +- CHANGELOG.md | 7 ++++++- development.cfg | 12 ++++++++++-- requirements.txt | 2 +- versions.cfg | 27 +++++++++++++-------------- 5 files changed, 31 insertions(+), 19 deletions(-) diff --git a/.github/workflows/buildout.yml b/.github/workflows/buildout.yml index 562f116..385469f 100644 --- a/.github/workflows/buildout.yml +++ b/.github/workflows/buildout.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d2f951..a70dc34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## yyyymmdd-vv +- upgrade to plone 6.0.13 [mamico] +- update node/node.ext.ldap/node.ext.ugm [mamico] +- dos_protection removed (there is a monkey in Products.CMFPlone that + fix the issue) [mamico] + ## 2024xxxx-01 - collective.taxonomy 3.0.1 => 3.1.2 [cekk] - main fix is: Fix keywords comparison [mamico] @@ -15,7 +21,6 @@ ## 20240917-01 - redturtle.prenotazioni 2.7.7 -> 2.7.8 - Remove csrf protection from send reminder endpoint. [folix-01] - - plone.recipe.varnish 6.0.11 -> 6.0.13 - Add cookie-pass-not-exclude config. The default value has ++resource++zmi, which is needed for Zope 5.9+ (Plone 6.0.10+). [mamico] - Use Varnish 6.0.13 LTS [mamico] diff --git a/development.cfg b/development.cfg index 8e80097..9ea399c 100644 --- a/development.cfg +++ b/development.cfg @@ -11,17 +11,25 @@ [buildout] extends = - https://raw.githubusercontent.com/plone/buildout.coredev/6.0.10.1/buildout.cfg + https://raw.githubusercontent.com/plone/buildout.coredev/6.0.13/buildout.cfg versions.cfg parts += site omelette allow-picked-versions = false +# XXX: se si aggiungono i test di design.* di rompono quelli di plone, in particolare +# plone.app.portlets. rimuoverlo col -= del buildout sembra non funzionare +# test-eggs += +# design.plone.policy[test] +# design.plone.contenttypes[test] +# test-eggs -= +# plone.app.portlets [test] [instance] eggs += - design.plone.policy collective.upgrade + design.plone.policy + design.plone.contenttypes [site] recipe = collective.recipe.plonesite diff --git a/requirements.txt b/requirements.txt index 5f29083..2e4627d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ --r https://dist.plone.org/release/6.0.10.1/requirements.txt \ No newline at end of file +-r https://dist.plone.org/release/6.0.13/requirements.txt diff --git a/versions.cfg b/versions.cfg index 8171f5a..d5fe25a 100644 --- a/versions.cfg +++ b/versions.cfg @@ -1,25 +1,24 @@ [buildout] extends = - https://dist.plone.org/release/6.0.10.1/versions.cfg - https://dist.plone.org/release/6.0.10.1/versions-ecosystem.cfg - https://dist.plone.org/release/6.0.10.1/versions-extra.cfg + https://dist.plone.org/release/6.0.13/versions.cfg + https://dist.plone.org/release/6.0.13/versions-ecosystem.cfg + https://dist.plone.org/release/6.0.13/versions-extra.cfg [iocomune] version = __CURRENT_VERSION__ -[config] -maxupload = 120MB +#[config] +#maxupload = 120MB # workaround per https://github.com/plone/Products.CMFPlone/issues/3848 -[instance-settings] -zope-conf-additional = - - form-memory-limit ${config:maxupload} - +#[instance-settings] +#zope-conf-additional = +# +# form-memory-limit ${config:maxupload} +# [versions] # verify during plone version update -plone.restapi = 9.6.0 # plone missing plone.patternslib = 1.3.0 @@ -152,9 +151,9 @@ perfmetrics = 3.3.0 # LDAP bda.cache = 1.3.0 five.globalrequest = 99.1 -node = 1.2.1 -node.ext.ldap = 1.1 -node.ext.ugm = 1.0 +node = 1.2.2 +node.ext.ldap = 1.2 +node.ext.ugm = 1.1 odict = 1.9.0 pas.plugins.ldap = 1.8.2 passlib = 1.7.4