Skip to content

Commit eb935f2

Browse files
authored
Merge branch '6.0' into first-time-contributor-update
2 parents 13bdbad + e234777 commit eb935f2

File tree

6 files changed

+113
-91
lines changed

6 files changed

+113
-91
lines changed

docs/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,8 @@ def source_replace(app, docname, source):
323323
source_replacements = {
324324
"{PLONE_BACKEND_MINOR_VERSION}": "6.0",
325325
"{PLONE_BACKEND_PATCH_VERSION}": "6.0.8",
326-
"{NVM_VERSION}": "0.39.3",
326+
"{NVM_VERSION}": "0.39.5",
327+
"{SUPPORTED_PYTHON_VERSIONS}": "3.8, 3.9, 3.10, or 3.11",
327328
}
328329

329330

docs/contributing/github-administration.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ This chapter describes how repositories under the Plone GitHub organization are
1616

1717
(contributing-github-repository-tagging-label)=
1818

19-
## Repository tagging
19+
## Repository topics
2020

21-
To find repositories and their purpose within the Plone organization, a set of tags are used for repositories within the Plone GitHub organization.
22-
The following tags are in use.
21+
To find repositories and their purpose within the Plone organization, a set of topics are used for repositories within the Plone GitHub organization.
22+
The following topics are in use.
2323

2424
`core`
2525
: repositories that are required by both Volto and Classic UI projects
@@ -47,3 +47,9 @@ The following tags are in use.
4747

4848
`tooling`
4949
: tools and applications needed to orchestrate Plone
50+
51+
## Manage topics
52+
53+
To update the topics of a GitHub repository, go to the repository's URL, such as https://github.com/plone/plone.batching, and click on the {guilabel}`gear icon` on the {guilabel}`About` section on the right side of the screen.
54+
55+
On the modal that opens up, fill the topics on the `Topics` field.

docs/glossary.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,13 @@ pip
7575
pip is the package installer for Python.
7676
See [tool recommendations](https://packaging.python.org/en/latest/guides/tool-recommendations/) for more information.
7777
78+
pipx
79+
[pipx](https://pypi.org/project/pipx/) allows you to install and run Python applications in isolated environments.
80+
81+
pyenv
82+
Python version management.
83+
[pyenv](https://github.com/pyenv/pyenv) lets you easily switch between multiple versions of Python.
84+
7885
pm2
7986
[PM2](https://pm2.keymetrics.io/) is a daemon process manager.
8087

docs/install/install-from-packages.md

Lines changed: 93 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ Plone 6 has both hardware requirements and software pre-requisites.
2929
The hardware requirements below give a rough estimate of the minimum hardware setup needed for a Plone server.
3030

3131
A single Plone installation is able to run many Plone sites.
32-
You may host multiple Plone sites on the same server.
3332

3433
- Installation of the Plone backend and Classic UI frontend requires a minimum of 256 MB of RAM and 2GB of disk swap space.
3534
- Installation of the Volto frontend requires a minimum of 2GB of RAM.
@@ -41,9 +40,7 @@ You may host multiple Plone sites on the same server.
4140

4241
````{warning}
4342
{term}`Add-on` products and caching solutions may also increase RAM and disk swap space requirements.
44-
4543
To avoid RAM and disk swap limitations, we recommend either temporarily resizing your remote machine to accommodate the build, or build your images locally and upload them to an image store, such as [Docker Hub](https://hub.docker.com/) or [GitHub Packages](https://github.com/features/packages).
46-
4744
```{seealso}
4845
[How much RAM is required to build a Volto front end?](https://community.plone.org/t/how-much-ram-is-required-to-build-a-volto-front-end/17949) and [Dealing with heap exhaustion while building Volto 17 on limited-RAM host](https://community.plone.org/t/dealing-with-heap-exhaustion-while-building-volto-17-on-limited-ram-host/18078).
4946
```
@@ -54,7 +51,7 @@ To avoid RAM and disk swap limitations, we recommend either temporarily resizing
5451

5552
### Pre-requisites for installation
5653

57-
- An operating system that runs all the pre-requisites.
54+
- An operating system that runs all the requirements mentioned above.
5855
Most UNIX-based operating systems are supported, including many Linux distributions, macOS, or {term}`Windows Subsystem for Linux` (WSL) on Windows.
5956
A UNIX-based operating system is recommended.
6057

@@ -63,43 +60,33 @@ To avoid RAM and disk swap limitations, we recommend either temporarily resizing
6360
If you get Plone to run on Windows alone, please feel free to document and share your process.
6461
```
6562
66-
- [Python](https://www.python.org/downloads/) 3.8, 3.9, or 3.10.
67-
- {term}`Cookiecutter`
63+
- Python {SUPPORTED_PYTHON_VERSIONS}
64+
- {term}`pipx`
6865
- {term}`nvm`
69-
- {term}`Node.js` LTS 16.x (see "Update" note)
66+
- {term}`Node.js` LTS 20.x
7067
- {term}`Yeoman`
7168
- {term}`Yarn`
7269
- {term}`GNU make`
7370
- {term}`Docker`
7471
75-
````{note}
76-
Update
77-
: [Node.js 18 is in LTS state as of 2022-10-25](https://github.com/nodejs/release#release-schedule), and Node.js 16 is now in maintenance mode.
78-
However, due to changes in internal SSL libraries, some Volto dependencies have been deprecated and need to be updated in order to continue working in Node.js 18, mainly [Webpack 4](https://github.com/webpack/webpack/issues/14532#issuecomment-947525539).
79-
You can still use it, but Node.js should be run under a special flag: `NODE_OPTIONS=--openssl-legacy-provider`.
80-
81-
```{seealso}
82-
Volto's pull request, [Support Node 18](https://github.com/plone/volto/pull/3699).
83-
```
84-
````
85-
8672
8773
(install-prerequisites-python-label)=
8874
8975
#### Python
9076
9177
Installing Python is beyond the scope of this documentation.
92-
However, it is recommended to use a Python version manager, [`pyenv`](https://github.com/pyenv/pyenv) that allows you to install multiple versions of Python on your development environment without destroying your system's Python.
78+
However, it is recommended to use a Python version manager, {term}`pyenv` that allows you to install multiple versions of Python on your development environment without destroying your system's Python.
79+
Plone requires Python version {SUPPORTED_PYTHON_VERSIONS}.
9380
9481
95-
(install-prerequisites-cookiecutter-label)=
82+
(install-prerequisites-pipx-label)=
9683
97-
#### Cookiecutter
84+
#### pipx
9885
99-
Install or upgrade {term}`Cookiecutter` in your user's Python:
86+
Install {term}`pipx`.
10087
10188
```shell
102-
pip install --user --upgrade cookiecutter
89+
pip install pipx
10390
```
10491

10592

@@ -146,10 +133,11 @@ For the `fish` shell, see [`nvm.fish`](https://github.com/jorgebucaran/nvm.fish)
146133
#### Node.js
147134

148135
1. Install or update the supported LTS version of Node.js.
149-
This command also activates that version.
136+
1. Install or update the supported LTS versions of Node.js, then activate the version supported in Volto.
150137

151138
```shell
152-
nvm install 16
139+
nvm install "lts/*"
140+
nvm use 20
153141
```
154142

155143
2. Verify that the supported version of Node.js is activated.
@@ -210,19 +198,19 @@ Finally, it is a good idea to update your system's version of `make`, because so
210198
Use your favorite search engine or trusted online resource for how to update `make`.
211199
212200
213-
(install-packages-install-label)=
214-
201+
(install-prerequisites-docker-label)=
215202
216203
#### Install Docker
217204
218205
Install [Docker Desktop](https://docs.docker.com/get-docker/) for your operating system.
219-
220206
Docker Desktop includes all Docker tools.
221207
222208
209+
(install-packages-install-label)=
210+
223211
## Install Plone 6
224212
225-
We install Plone 6 with {term}`pip`, {term}`Cookiecutter`, {term}`mxdev`, {term}`make`, and other developer tools.
213+
We install Plone 6 with {term}`pipx`, {term}`Cookiecutter`, {term}`mxdev`, {term}`make`, and other developer tools.
226214
227215
```{note}
228216
We do not maintain documentation for installing Plone 6 or later with `buildout`.
@@ -237,64 +225,97 @@ mkdir my_project
237225
cd my_project
238226
```
239227
240-
Run `cookiecutter` to create a Plone project skeleton using the Cookiecutter {term}`cookiecutter-plone-starter` with the following command.
228+
Issue the following command to install or update `cookiecutter`, then run it to create a Plone project skeleton using the Cookiecutter {term}`cookiecutter-plone-starter`.
241229
242230
```shell
243-
cookiecutter https://github.com/collective/cookiecutter-plone-starter
231+
pipx run cookiecutter gh:collective/cookiecutter-plone-starter
244232
```
245233
246234
You will be presented with a series of prompts.
247235
You can accept the default values in square brackets (`[default-option]`) by hitting the {kbd}`Enter` key, or enter your preferred values.
248236
For ease of documentation, we will use the default values.
249237
250238
```console
251-
You've downloaded <path-to-cookiecutter>/cookiecutter-plone-starter before. Is it okay to delete and re-download it? [yes]:
252-
project_title [Project Title]:
253-
project_slug [project-title]:
254-
description [A new project using Plone 6.]:
255-
author [Plone Foundation]:
256-
257-
python_package_name [project_title]:
258-
plone_version [6.0.0]:
259-
volto_version [16.5.0]:
260-
volto_generator_version [6.2.0]:
261-
Select language_code:
262-
1 - en
263-
2 - de
264-
3 - es
265-
4 - pt-br
266-
Choose from 1, 2, 3, 4 [1]:
267-
github_organization [collective]:
268-
Select container_registry:
269-
1 - Docker Hub
270-
2 - GitHub
271-
Choose from 1, 2 [1]:
272-
================================================================================
273-
Project Title generation
239+
% pipx run cookiecutter gh:collective/cookiecutter-plone-starter
240+
241+
242+
Cookiecutter Plone Starter
274243
================================================================================
275-
Running sanity checks
276-
- Python: ✓
277-
- Node: ✓
278-
- yo: ✓
279-
- Docker: ✓
280-
- git: ✓
244+
245+
Sanity checks
246+
--------------------------------------------------------------------------------
247+
[1/5] Python: ✓
248+
[2/5] Node: ✓
249+
[3/5] yo: ✓
250+
[4/5] Docker: ✓
251+
[5/5] git: ✓
252+
253+
Project details
254+
--------------------------------------------------------------------------------
255+
256+
[1/19] Project Title (Project Title): Plone Conference Website 2070
257+
[2/19] Project Description (A new project using Plone 6.):
258+
[3/19] Project Slug (Used for repository id) (plone-conference-website-2070):
259+
[4/19] Project URL (without protocol) (plone-conference-website-2070.example.com):
260+
[5/19] Author (Plone Foundation): Elli
261+
[6/19] Author E-mail ([email protected]): [email protected]
262+
[7/19] Python Package Name (plone_conference_website_2070):
263+
[8/19] Volto Addon Name (volto-plone-conference-website-2070):
264+
[9/19] Choose a Python Test Framework
265+
1 - pytest
266+
2 - unittest
267+
Choose from [1/2] (1):
268+
[10/19] Plone Version (6.0.8):
269+
[11/19] Should we use Volto Alpha Versions? (No): yes
270+
[12/19] Volto Version (18.0.0-alpha.1):
271+
[13/19] Volto Generator Version (8.0.0):
272+
[14/19] Language
273+
1 - English
274+
2 - Deutsch
275+
3 - Español
276+
4 - Português (Brasil)
277+
5 - Nederlands
278+
6 - Suomi
279+
Choose from [1/2/3/4/5/6] (1):
280+
[15/19] GitHub Username or Organization (collective): ellizurigo
281+
[16/19] Container Registry
282+
1 - GitHub Container Registry
283+
2 - Docker Hub
284+
Choose from [1/2] (1):
285+
[17/19] Should we setup a caching server?
286+
1 - Yes
287+
2 - No
288+
Choose from [1/2] (1): 2
289+
[18/19] Add Ansible playbooks?
290+
1 - Yes
291+
2 - No
292+
Choose from [1/2] (1):
293+
[19/19] Add GitHub Action to Deploy this project?
294+
1 - Yes
295+
2 - No
296+
Choose from [1/2] (1):
297+
298+
Plone Conference Website 2070 generation
299+
--------------------------------------------------------------------------------
281300
282301
Summary:
283-
- Plone version: 6.0.0
284-
- Volto version: 16.5.0
285-
- Volto Generator version: 6.2.0
286-
- Output folder: <path-to-project>/project-title
302+
- Plone version: 6.0.8
303+
- Volto version: 18.0.0-alpha.1
304+
- Volto Generator version: 8.0.0
305+
- Output folder: /Users/katjasuss/Desktop/_temp/scratch_cookiecutter_plone/plone-conference-website-2070
287306
288307
Frontend codebase:
289-
- Installing @plone/[email protected]
290-
- Generate frontend application with @plone/volto 16.5.0
308+
- Installing required npm packages
309+
- Generate frontend application with @plone/volto 18.0.0-alpha.1
291310
292311
Backend codebase
312+
- Remove folder src/plone_conference_website_2070/src/plone_conference_website_2070/tests not used by pytest
293313
- Format generated code in the backend
294-
================================================================================
295314
296-
Project "Project Title" was generated
315+
================================================================================
297316
317+
Project "Plone Conference Website 2070" was generated
318+
--------------------------------------------------------------------------------
298319
Now, code it, create a git repository, push to your organization.
299320
300321
Sorry for the convenience,
@@ -303,13 +324,13 @@ The Plone Community.
303324
================================================================================
304325
```
305326
306-
Change to your project directory {file}`project-title`.
327+
Change to your project directory {file}`plone-conference-website-2070`.
307328
308329
```shell
309-
cd project-title
330+
cd plone-conference-website-2070
310331
```
311332
312-
Next we switch to using `make`.
333+
Next you switch to using `make`.
313334
To see all available commands and their descriptions, enter the following command.
314335
315336
```shell
@@ -325,21 +346,8 @@ make install
325346
This will take a few minutes.
326347
☕️
327348
First the backend, then the frontend will be installed.
328-
At the start of the frontend installation part, you might see a prompt.
329349
330-
```console
331-
Need to install the following packages:
332-
mrs-developer
333-
Ok to proceed? (y)
334-
```
335-
336-
Hit the {kbd}`Enter` key to proceed and install `mrs-developer`.
337-
338-
When the process completes successfully, it will exit with a message similar to the following.
339-
340-
```console
341-
✨ Done in 98.97s.
342-
```
350+
When the process completes successfully, it will exit with no message.
343351
344352
345353
(install-packages-start-plone-label)=

submodules/volto

Submodule volto updated 44 files

0 commit comments

Comments
 (0)