Skip to content

Commit fd07d04

Browse files
authored
Upgrade to Plone 6.1.0 / Volto 18.8.2 (#4)
* Upgrade Plone to version 6.1.0 * Upgrade Volto to 18.8.2 * Bump pas.plugins.authomatic * Add default types to installation * Update initial content * Fix GHA
1 parent d6dd8cd commit fd07d04

File tree

53 files changed

+4594
-550
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+4594
-550
lines changed

.github/workflows/frontend.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ jobs:
4747
node-version: ${{ env.NODE_VERSION }}
4848

4949
- name: Enable corepack
50-
run: corepack enable
50+
run: |
51+
npm i -g corepack@latest
52+
corepack enable
5153
5254
- name: Get pnpm store directory
5355
shell: bash

backend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
ARG PLONE_VERSION=6.0.13
2+
ARG PLONE_VERSION=6.1.0
33
FROM plone/server-builder:${PLONE_VERSION} as builder
44

55
WORKDIR /app

backend/Dockerfile.acceptance

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
ARG PLONE_VERSION=6.0.13
2+
ARG PLONE_VERSION=6.1.0
33
FROM plone/server-builder:${PLONE_VERSION} as builder
44

55
WORKDIR /app

backend/constraints.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-c https://dist.plone.org/release/6.0.13/constraints.txt
1+
-c https://dist.plone.org/release/6.1.0/constraints.txt

backend/mx.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
[settings]
77
main-package = -e .[test]
88
; example how to override a package version
9-
; version-overrides =
10-
; example.package==2.1.0a2
9+
version-overrides =
10+
plone.volto==5.0.3
1111

1212
; example section to use packages from git
1313
; [example.contenttype]

backend/setup.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
"Framework :: Plone :: Addon",
2626
"Framework :: Plone :: 6.0",
2727
"Programming Language :: Python",
28-
"Programming Language :: Python :: 3.8",
29-
"Programming Language :: Python :: 3.9",
30-
"Programming Language :: Python :: 3.10",
3128
"Programming Language :: Python :: 3.11",
3229
"Programming Language :: Python :: 3.12",
3330
"Operating System :: OS Independent",
@@ -48,15 +45,14 @@
4845
package_dir={"": "src"},
4946
include_package_data=True,
5047
zip_safe=False,
51-
python_requires=">=3.8",
48+
python_requires=">=3.11",
5249
install_requires=[
5350
"setuptools",
54-
"Plone",
5551
"plone.api",
5652
"plone.restapi",
57-
"plone.volto",
53+
"plone.volto>=5.0.3",
5854
"plone.exportimport",
59-
"pas.plugins.authomatic>=1.4.0",
55+
"pas.plugins.authomatic>=2.0.0b2",
6056
"collective.volto.formsupport",
6157
"collective.honeypot",
6258
"collective.volto.otp",

backend/src/pythonbrasil/site/profiles/default/metadata.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<metadata>
33
<version>1000</version>
44
<dependencies>
5+
<dependency>profile-plone.app.contenttypes:default</dependency>
56
<dependency>profile-plone.volto:default</dependency>
67
<dependency>profile-plone.app.caching:default</dependency>
78
<dependency>profile-plone.app.caching:with-caching-proxy</dependency>

backend/src/pythonbrasil/site/setuphandlers/examplecontent/content/03e3d75a791d4fa98378626ba8f62d07/data.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"Subject": [],
3636
"UID": "a720393b3c0240e5bd27c43fcd2cfd1e",
3737
"description": "Site images",
38-
"effective": "1969-12-31T03:00:00+00:00",
38+
"effective": "1969-12-31T00:00:00+00:00",
3939
"image_field": null,
4040
"image_scales": {},
4141
"review_state": "published",

backend/src/pythonbrasil/site/setuphandlers/examplecontent/content/0d05308db57c450da4ae80e8a3c47ece/data.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"Subject": [],
3636
"UID": "a720393b3c0240e5bd27c43fcd2cfd1e",
3737
"description": "Site images",
38-
"effective": "1969-12-31T03:00:00+00:00",
38+
"effective": "1969-12-31T00:00:00+00:00",
3939
"image_field": null,
4040
"image_scales": {},
4141
"review_state": "published",
Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
{
2+
"@id": "/evento/edicoes-anteriores",
3+
"@type": "Document",
4+
"UID": "1e6a267195ba41459ce3a869ac4714f6",
5+
"allow_discussion": null,
6+
"blocks": {
7+
"7a865fc0-c818-4eea-a2ce-00b27eedc742": {
8+
"@type": "description"
9+
},
10+
"83d1530b-947f-4152-885a-d420ee9cd1ae": {
11+
"@type": "title"
12+
},
13+
"f485daa6-93dc-4e6e-ad16-baa34042887a": {
14+
"@type": "slate",
15+
"plaintext": "",
16+
"styles": {},
17+
"value": [
18+
{
19+
"children": [
20+
{
21+
"text": ""
22+
}
23+
],
24+
"type": "p"
25+
}
26+
]
27+
}
28+
},
29+
"blocks_layout": {
30+
"items": [
31+
"83d1530b-947f-4152-885a-d420ee9cd1ae",
32+
"7a865fc0-c818-4eea-a2ce-00b27eedc742",
33+
"f485daa6-93dc-4e6e-ad16-baa34042887a"
34+
]
35+
},
36+
"contributors": [],
37+
"created": "2025-01-30T21:29:57+00:00",
38+
"creators": [
39+
"e9ba8889-9bb3-4d41-9b0f-6c5dfbca6629"
40+
],
41+
"description": "S\u00e3o 20 anos de Python Brasil, conhe\u00e7a a nossa hist\u00f3ria",
42+
"effective": null,
43+
"exclude_from_nav": false,
44+
"expires": null,
45+
"exportimport.constrains": {},
46+
"exportimport.conversation": [],
47+
"exportimport.versions": {},
48+
"id": "edicoes-anteriores",
49+
"is_folderish": true,
50+
"language": "##DEFAULT##",
51+
"layout": "document_view",
52+
"lock": {
53+
"locked": false,
54+
"stealable": true
55+
},
56+
"modified": "2025-01-30T21:29:57+00:00",
57+
"parent": {
58+
"@id": "/evento",
59+
"@type": "Document",
60+
"Subject": [],
61+
"UID": "81bb6aa3c33644c296ffbc767b8c05c7",
62+
"description": "Conhe\u00e7a a PythonBrasil, o maior evento da Am\u00e9rica Latina sobre a linguagem Python e suas aplica\u00e7\u00f5es",
63+
"effective": "2025-01-30T21:38:00+00:00",
64+
"image_field": null,
65+
"image_scales": {},
66+
"review_state": "published",
67+
"title": "O Evento",
68+
"type_title": "Page"
69+
},
70+
"preview_caption": null,
71+
"preview_image": null,
72+
"review_state": "private",
73+
"rights": "",
74+
"subjects": [],
75+
"title": "Edi\u00e7\u00f5es Anteriores",
76+
"type_title": "Page",
77+
"version": "current",
78+
"workflow_history": {
79+
"simple_publication_workflow": [
80+
{
81+
"action": null,
82+
"actor": "e9ba8889-9bb3-4d41-9b0f-6c5dfbca6629",
83+
"comments": "",
84+
"review_state": "private",
85+
"time": "2025-01-30T21:29:57+00:00"
86+
}
87+
]
88+
},
89+
"working_copy": null,
90+
"working_copy_of": null
91+
}

0 commit comments

Comments
 (0)