Skip to content

Commit d633bbb

Browse files
stevepiercystevepiercy
authored
Prepare for Plone 6.1 release (#1845)
* Prepare for Plone 6.1 release TODO: - [X] After the release, we need to run `pipx run cookieplone project --no-input` and replace the current console output with the command's in `docs/install/create-project-cookieplone.md`. * Bump `PLONE_BACKEND_MINOR_VERSION` * Bump `requirements-initial.txt` for 6.1 * Update Cookieplone console output
1 parent eb1c02a commit d633bbb

File tree

9 files changed

+32
-28
lines changed

9 files changed

+32
-28
lines changed

‎docs/admin-guide/install-buildout.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,12 @@ For other installation options, see {ref}`get-started-install-label`.
3131

3232
## Prerequisites for installation
3333

34-
- For Plone 6.0, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE60}}
35-
% TODO: These instructions install Plone 6.0.x. Uncomment next line and change the subsequent include when Plone 6.1 is released and "latest".
36-
% - For Plone 6.1, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}
34+
- For Plone 6.1, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}
3735

3836

3937
### Python
4038

41-
```{include} /_inc/_install-python-plone60.md
39+
```{include} /_inc/_install-python-plone61.md
4240
```
4341

4442

‎docs/admin-guide/install-pip.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,12 @@ For other installation options, see {ref}`get-started-install-label`.
3131

3232
## Prerequisites for installation
3333

34-
- For Plone 6.0, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE60}}
35-
% TODO: These instructions install Plone 6.0.x. Uncomment next line and change the subsequent include when Plone 6.1 is released and "latest".
36-
% - For Plone 6.1, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}
34+
- For Plone 6.1, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}
3735

3836

3937
### Python
4038

41-
```{include} /_inc/_install-python-plone60.md
39+
```{include} /_inc/_install-python-plone61.md
4240
```
4341

4442

@@ -60,7 +58,7 @@ python3 -m venv venv
6058
Install Plone and a helper package, {term}`pipx`.
6159

6260
```shell
63-
venv/bin/pip install -c https://dist.plone.org/release/6.0-latest/constraints.txt Plone pipx
61+
venv/bin/pip install -c https://dist.plone.org/release/6.1-latest/constraints.txt Plone pipx
6462
```
6563

6664

‎docs/backend/upgrading/version-specific-migration/upgrade-to-61.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Some may require changes in your setup.
1717

1818
## Drop Python 3.8 and 3.9
1919

20-
We only support Python 3.10, 3.11, and 3.12.
20+
We only support Python {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}.
2121

2222

2323
## TinyMCE upgraded in Classic UI

‎docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ def source_replace(app, docname, source):
441441

442442
# Dict of replacements.
443443
source_replacements = {
444-
"{PLONE_BACKEND_MINOR_VERSION}": "6.0",
444+
"{PLONE_BACKEND_MINOR_VERSION}": "6.1",
445445
}
446446

447447
# Finally, configure app attributes.

‎docs/install/create-project-cookieplone.md

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ Plone 6 has both hardware requirements and software prerequisites.
6767
```{include} /_inc/_install-python-plone61.md
6868
```
6969

70-
Plone 6.0 requires Python version {{SUPPORTED_PYTHON_VERSIONS_PLONE60}}.
71-
However, Cookieplone does not support Python 3.9.
70+
Plone 6.1 requires Python version {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}.
7271

7372
```{warning}
7473
Python 3.9 will reach [end of life in October 2025](https://devguide.python.org/versions/).
@@ -132,12 +131,11 @@ See the cookiecutter's README for how to [Use options to avoid prompts](https://
132131
```
133132
134133
```{important}
135-
For {guilabel}`Project Slug`, you must not use any of the Plone core package names listed in [`constraints.txt`](https://dist.plone.org/release/6.0-latest/constraints.txt).
134+
For {guilabel}`Project Slug`, you must not use any of the Plone core package names listed in [`constraints.txt`](https://dist.plone.org/release/6.1-latest/constraints.txt).
136135
Note that pip normalizes these names, so `plone.volto` and `plone-volto` are the same package.
137136
```
138137
139138
```console
140-
% pipx run cookieplone project
141139
╭──────────────────────────────── cookieplone ────────────────────────────────╮
142140
│ │
143141
│ .xxxxxxxxxxxxxx. │
@@ -172,7 +170,17 @@ Note that pip normalizes these names, so `plone.volto` and `plone-volto` are the
172170
You've downloaded /Users/stevepiercy/.cookiecutters/cookieplone-templates
173171
before. Is it okay to delete and re-download it? [y/n] (y):
174172
╭─────────────────────────────── Plone Project ───────────────────────────────╮
173+
│ │
175174
│ Creating a new Plone Project │
175+
│ │
176+
│ Sanity check results: │
177+
│ │
178+
│ - Cookieplone: ✓ │
179+
│ - Python: ✓ │
180+
│ - Node: ✓ │
181+
│ - git: ✓ │
182+
│ - Docker (optional): ✓ │
183+
│ │
176184
╰─────────────────────────────────────────────────────────────────────────────╯
177185
[1/17] Project Title (Project Title):
178186
[2/17] Project Description (A new project using Plone 6.):
@@ -181,9 +189,9 @@ before. Is it okay to delete and re-download it? [y/n] (y):
181189
[5/17] Author (Plone Foundation):
182190
[6/17] Author E-mail (collective@plone.org):
183191
[7/17] Should we use prerelease versions? (No):
184-
[8/17] Plone Version (6.0.13):
185-
[9/17] Volto Version (18.0.0-alpha.43):
186-
[10/17] Python Package Name (project.title):
192+
[8/17] Plone Version (6.1.0):
193+
[9/17] Volto Version (18.8.1):
194+
[10/17] Python Package Name (project.title):
187195
[11/17] Volto Addon Name (volto-project-title):
188196
[12/17] Language
189197
1 - English
@@ -215,10 +223,9 @@ before. Is it okay to delete and re-download it? [y/n] (y):
215223
│ │
216224
│ Summary: │
217225
│ │
218-
│ - Plone version: 6.0.13 │
219-
│ - Volto version: 18.0.0-alpha.43 │
220-
│ - Output folder: │
221-
│ <PATH_TO>/project-title │
226+
│ - Plone version: 6.1.0 │
227+
│ - Volto version: 18.8.1 │
228+
│ - Output folder: <PATH_TO>/project-title │
222229
│ │
223230
│ │
224231
╰─────────────────────────────────────────────────────────────────────────────╯

‎docs/install/create-project.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Plone 6.0 has both hardware requirements and software prerequisites.
5454
```{include} ../volto/_inc/_install-operating-system.md
5555
```
5656

57-
- Python {{SUPPORTED_PYTHON_VERSIONS_PLONE60}}
57+
- Python {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}
5858
- {term}`pipx`
5959
- {term}`nvm`
6060
- {term}`Node.js` LTS 20.x

‎docs/install/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Then choose one of the following installation methods.
4747
If you are following a [Plone training](https://training.plone.org/), it should specify which option to choose.
4848

4949
{doc}`create-project-cookieplone`
50-
: This is the recommended way to install Plone 6 for a new project with the Volto frontend.
50+
: This is the recommended way to install Plone for a new project with the Volto frontend.
5151
Cookieplone requires Python version {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}.
5252

5353
{doc}`/admin-guide/install-buildout`

‎docs/upgrade/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ Plone has several components, each of which have their own upgrade guides:
1919

2020
For Plone 6 the most relevant guides are:
2121

22+
- {doc}`../backend/upgrading/version-specific-migration/upgrade-to-61`
2223
- {doc}`../backend/upgrading/version-specific-migration/upgrade-to-60`
2324
- {doc}`../backend/upgrading/version-specific-migration/migrate-to-volto`

‎requirements-initial.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# requirements-initial.txt
2-
# From https://dist.plone.org/release/6-latest/constraints.txt
3-
pip==24.0
4-
setuptools==71.0.0
5-
wheel==0.43.0
2+
# From https://dist.plone.org/release/6.1.0/constraints.txt
3+
pip==24.3.1
4+
setuptools==75.6.0
5+
wheel==0.45.1

0 commit comments

Comments
 (0)