Skip to content

Commit d93599a

Browse files
authored
Merge branch 'main' into relstorage-4
2 parents 63016ff + 8142457 commit d93599a

File tree

4 files changed

+109
-28
lines changed

4 files changed

+109
-28
lines changed

.github/workflows/build.yml

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
name: Update gh docker image and triggers
22

3+
permissions:
4+
contents: read
5+
packages: write
6+
actions: read
7+
38
on:
49
# Triggers the workflow on releases
510
push:
@@ -55,28 +60,28 @@ jobs:
5560
tags: ${{ env.IMAGE_ID }}:${{ env.VERSION }}
5661
platforms: linux/amd64,linux/arm64
5762

58-
- name: Deploy to rancher # io-comune-test
59-
if: github.ref == 'main'
60-
uses: redturtle/rancher-deploy-action@v0.2.0
61-
with:
62-
host: ${{ secrets.RANCHER_HOST }} # organization
63-
api-username: ${{ secrets.RANCHER_API_USERNAME }} # organization
64-
api-password: ${{ secrets.RANCHER_API_PASSWORD }} # organization
65-
cluster-id: ${{ secrets.RANCHER_CLUSTER_ID }} # organization
66-
project-id: ${{ secrets.RANCHER_PROJECT_ID }} # organization
67-
namespace: ${{ secrets.RANCHER_NAMESPACE }}
68-
workload: ${{ secrets.RANCHER_WORKLOAD }}
69-
image: ${{ env.IMAGE_ID }}:${{ env.VERSION }}
70-
slack-hook-url: ${{ secrets.RANCHER_SLACK_HOOK_URL }}
71-
72-
- name: Trigger job
73-
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
74-
run: |
75-
curl --fail --request POST \
76-
--form token=${{ secrets.TOKEN }} \
77-
--form ref=main \
78-
--form "variables[GITHUB_TAG]=${{ env.VERSION }}" \
79-
"https://gitlab.com/api/v4/projects/${{ secrets.PROJECT_ID }}/trigger/pipeline"
63+
# - name: Deploy to rancher # io-comune-test
64+
# if: github.ref == 'main'
65+
# uses: redturtle/rancher-deploy-action@v0.2.0
66+
# with:
67+
# host: ${{ secrets.RANCHER_HOST }} # organization
68+
# api-username: ${{ secrets.RANCHER_API_USERNAME }} # organization
69+
# api-password: ${{ secrets.RANCHER_API_PASSWORD }} # organization
70+
# cluster-id: ${{ secrets.RANCHER_CLUSTER_ID }} # organization
71+
# project-id: ${{ secrets.RANCHER_PROJECT_ID }} # organization
72+
# namespace: ${{ secrets.RANCHER_NAMESPACE }}
73+
# workload: ${{ secrets.RANCHER_WORKLOAD }}
74+
# image: ${{ env.IMAGE_ID }}:${{ env.VERSION }}
75+
# slack-hook-url: ${{ secrets.RANCHER_SLACK_HOOK_URL }}
76+
77+
# - name: Trigger job
78+
# if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
79+
# run: |
80+
# curl --fail --request POST \
81+
# --form token=${{ secrets.TOKEN }} \
82+
# --form ref=main \
83+
# --form "variables[GITHUB_TAG]=${{ env.VERSION }}" \
84+
# "https://gitlab.com/api/v4/projects/${{ secrets.PROJECT_ID }}/trigger/pipeline"
8085

8186
build-acceptance-image:
8287
name: Build docker image for acceptance tests

CHANGELOG.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,49 @@
33
## YYYYMMDD-XX
44
- aggiornato relstorage 3 a relstorage 4 (nessun cambiamento rilevante indicato)
55

6+
## 20250711-01
7+
- iocittadino.pagamenti.base 1.0.9 -> 1.0.11
8+
- fix async payment
9+
10+
## 20250711-01
11+
- iocittadino.pagamenti.base 1.0.7 -> 1.0.9
12+
- fix zpretty
13+
14+
## 20250708-01
15+
- design.plone.iocittadino 1.2.4 -> 1.2.5
16+
- fix for async call [lucabel]
17+
- collective.taskqueue2 1.0a1
18+
- iocittadino.protocollo.maggioli 1.0.12 -> 1.0.13
19+
- fix for async call [lucabel]
20+
- iocittadino.pagamenti.base 1.0.7 -> 1.0.8
21+
- introduce async flow after payment [lucabel]
22+
23+
## 20250704--01
24+
- design.plone.policy 5.0.16 -> 5.0.17
25+
- Fix exclude_from_nav index value for initial setup contents. [folix-01]
26+
27+
## 20250702--01
28+
- redturtle.volto 5.5.10 -> 5.5.12
29+
- fix not search
30+
[mamico]
31+
- Fix rss feed image selection, now it uses the correct field for preview_image.
32+
[mamico]
33+
- Handle sort_on also when using AdvancedQuery.
34+
[cekk]
35+
- Remove z3c.jbot compatibility and customize templates in standard-way.
36+
[cekk]
37+
- Force indexing subjects in SearchableText with ICategorization to keep the old Plone functionality (remove this when the official pr is merged).
38+
[cekk]
39+
40+
## 202506-26-01
41+
- design.plone.iocittadino 1.2.3 -> 1.2.4
42+
- Fix: gestione date nell'history e nel report pdf, nel serializzatore della history forzato, anche in retrocompatibilità
43+
per tornare la data in iso senza millisecondi
44+
[mamico]
45+
- Add protocolli and payments version fix.
46+
[cekk]
47+
- experimental.noacquisition = 1.0.0b10
48+
649
## 20250515-01
750
- redturtle.prenotazioni 2.8.6 -> 2.8.8
851
- Fix get_busy_slots_in_period method to handle also borderline bookings (for example that starts inside a slot, but ends after). [cekk]

dependabot/requirements.txt

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ collective.recipe.vscode==0.1.9
120120
collective.regenv==1.0.0rc1
121121
collective.sentry==0.3.2
122122
collective.stats==1.1.0
123+
collective.taskqueue2==1.0a1
123124
collective.taxonomy==3.1.5
124125
collective.tiles.collection==2.0.0
125126
collective.venue==4.1
@@ -150,16 +151,19 @@ dataflake.wsgi.bjoern==2.0
150151
decorator==5.1.1
151152
defusedxml==0.7.1
152153
design.plone.contenttypes==6.3.6
153-
design.plone.iocittadino==1.2.3
154+
design.plone.iocittadino==1.2.5
154155
design.plone.ioprenoto==1.2.10
155-
design.plone.policy==5.0.15
156+
design.plone.policy==5.0.16
156157
diazo==2.0.2
157158
distro==1.9.0
158159
docutils==0.21.2
160+
docxcompose==1.4.0
161+
docxtpl==0.20.0
159162
emailcompat32crlf==1.0.3
160163
et-xmlfile==1.1.0
161164
exceptiongroup==1.2.2
162165
experimental.gracefulblobmissing==2.0
166+
experimental.noacquisition==1.0.0b10
163167
fancycompleter==0.9.1
164168
feedparser==6.0.11
165169
filelock==3.16.1
@@ -181,6 +185,7 @@ h11==0.14.0
181185
haufe.requestmonitoring==0.6.0
182186
html5lib==1.1
183187
httplib2==0.22.0
188+
huey==2.5.3
184189
hurry.filesize==0.9
185190
i18ndude==6.2.1
186191
icalendar==5.0.13
@@ -190,6 +195,10 @@ imagesize==1.4.1
190195
importlib-metadata==8.5.0
191196
importlib-resources==6.4.5
192197
incremental==24.7.2
198+
iocittadino.pagamenti.base==1.0.11
199+
iocittadino.pagamenti.nextstep==1.0.3
200+
iocittadino.protocollo.maggioli==1.0.13
201+
iocittadino.protocollo.maggiolitest==1.0.2
193202
isodate==0.6.1
194203
isoduration==20.11.0
195204
iw.rejectanonymous==1.2.7
@@ -383,6 +392,7 @@ pyrepl==0.9.0
383392
pyroma==4.2
384393
pyrsistent==0.20.0
385394
python-dateutil==2.9.0.post0
395+
python-docx==1.1.2
386396
python-dotenv==1.0.1
387397
python-gettext==5.0
388398
python-ldap==3.4.3
@@ -396,8 +406,9 @@ redturtle.filesretriever==1.0.3
396406
redturtle.pasldap==1.0.0a2
397407
redturtle.prenotazioni==2.8.8
398408
redturtle.rssservice==2.2.0
409+
redturtle.scale==1.0a2
399410
redturtle.unitaterritoriali==1.0.1
400-
redturtle.volto==5.5.10
411+
redturtle.volto==5.5.12
401412
redturtle.voltoplugin.editablefooter==1.3.4
402413
referencing==0.35.1
403414
repoze.catalog==0.9.0

versions.cfg

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ collective.volto.subfooter = 1.1.1
6060
collective.volto.subsites = 1.5.1
6161
collective.z3cform.datagridfield = 3.0.1
6262
design.plone.contenttypes = 6.3.6
63-
design.plone.policy = 5.0.15
63+
design.plone.policy = 5.0.16
6464
et-xmlfile = 1.1.0
6565
geographiclib = 1.50
6666
geopy = 1.21.0
@@ -78,10 +78,11 @@ PyYAML = 6.0.1
7878
redturtle.bandi = 1.6.0
7979
redturtle.faq = 1.0.2
8080
redturtle.filesretriever = 1.0.3
81+
redturtle.scale = 1.0a2
8182
rer.newsletter = 3.1.1
8283
redturtle.rssservice = 2.2.0
8384
redturtle.voltoplugin.editablefooter = 1.3.4
84-
redturtle.volto = 5.5.10
85+
redturtle.volto = 5.5.12
8586
rer.customersatisfaction = 2.2.4
8687
sentry-sdk = 2.0.0
8788
cssutils = 2.11.0
@@ -100,7 +101,7 @@ Products.ZMIntrospection = 1.0
100101
experimental.gracefulblobmissing = 2.0
101102

102103
# io-cittadino
103-
design.plone.iocittadino = 1.2.3
104+
design.plone.iocittadino = 1.2.5
104105
Brotli = 1.0.9
105106
cssselect2 = 0.7.0
106107
fonttools = 4.56.0
@@ -118,6 +119,21 @@ webencodings = 0.5.1
118119
zeep = 4.2.1
119120
zopfli = 0.2.2
120121

122+
# protocollo
123+
iocittadino.protocollo.maggioli = 1.0.13
124+
iocittadino.protocollo.maggiolitest = 1.0.2
125+
requests-file = 2.0.0
126+
zeep = 4.2.1
127+
platformdirs = 4.2.0
128+
isodate = 0.6.1
129+
130+
# pagamenti
131+
iocittadino.pagamenti.base = 1.0.11
132+
iocittadino.pagamenti.nextstep = 1.0.3
133+
collective.taskqueue2 = 1.0a1
134+
huey = 2.5.3
135+
furl = 2.1.3
136+
121137
# io-prenoto
122138
design.plone.ioprenoto = 1.2.10
123139
redturtle.prenotazioni = 2.8.8
@@ -191,6 +207,7 @@ plone.recipe.varnish = 6.0.13
191207
collective.recipe.template = 2.2
192208
collective.recipe.cmd = 0.11
193209
click = 8.1.8
210+
experimental.noacquisition = 1.0.0b10
194211

195212
# oidc
196213
pas.plugins.oidc = 2.0.0b4
@@ -205,6 +222,11 @@ Mako = 1.1.5
205222
pyjwkest = 1.4.2
206223
pycryptodomex = 3.11.0
207224

225+
# docxtemplate
226+
python-docx = 1.1.2
227+
docxtpl = 0.20.0
228+
docxcompose = 1.4.0
229+
208230
# do not fix these (?)
209231
setuptools=
210232
zc.buildout=

0 commit comments

Comments
 (0)