Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade to plone 6.0.13 #82

Merged
merged 16 commits into from
Sep 18, 2024
2 changes: 1 addition & 1 deletion .github/workflows/buildout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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]
Expand Down
12 changes: 10 additions & 2 deletions development.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-r https://dist.plone.org/release/6.0.10.1/requirements.txt
-r https://dist.plone.org/release/6.0.13/requirements.txt
27 changes: 13 additions & 14 deletions versions.cfg
Original file line number Diff line number Diff line change
@@ -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 =
<dos_protection>
form-memory-limit ${config:maxupload}
</dos_protection>
#[instance-settings]
#zope-conf-additional =
# <dos_protection>
# form-memory-limit ${config:maxupload}
# </dos_protection>

[versions]
# verify during plone version update
plone.restapi = 9.6.0

# plone missing
plone.patternslib = 1.3.0
Expand Down Expand Up @@ -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
Expand Down
Loading