Update backend to Plone 6.1b1 (#58)

* Update backend to Plone 6.1b1

* Upgrade plain Volto site to Plone 6.1.0b1

* Apply suggestions from code review

Co-authored-by: David Glick <[email protected]>

* Apply David's suggestions

* Fix lint

---------

Co-authored-by: David Glick <[email protected]>

backend-volto/.dockerignore

@@ -2,11 +2,13 @@
 .gitattributes
 bin
 Dockerfile
+Dockerfile.acceptance
 include
 instance
 instance.yaml
 lib
 lib64
 Makefile
 pyvenv.cfg
-var
+var
+.venv

backend-volto/.editorconfig

@@ -0,0 +1,54 @@
+# Generated from:
+# https://github.com/plone/meta/tree/master/config/default
+# See the inline comments on how to expand/tweak this configuration file
+#
+# EditorConfig Configuration file, for more details see:
+# http://EditorConfig.org
+# EditorConfig is a convention description, that could be interpreted
+# by multiple editors to enforce common coding conventions for specific
+# file types
+
+# top-most EditorConfig file:
+# Will ignore other EditorConfig files in Home directory or upper tree level.
+root = true
+
+
+[*]  # For All Files
+# Unix-style newlines with a newline ending every file
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+# Set default charset
+charset = utf-8
+# Indent style default
+indent_style = space
+# Max Line Length - a hard line wrap, should be disabled
+max_line_length = off
+
+[*.{py,cfg,ini}]
+# 4 space indentation
+indent_size = 4
+
+[*.{yml,zpt,pt,dtml,zcml}]
+# 2 space indentation
+indent_size = 2
+
+[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss,html}]  # Frontend development
+# 2 space indentation
+indent_size = 2
+max_line_length = 80
+
+[{Makefile,.gitmodules}]
+# Tab indentation (no size specified, but view as 4 spaces)
+indent_style = tab
+indent_size = unset
+tab_width = unset
+
+
+##
+# Add extra configuration options in .meta.toml:
+#  [editorconfig]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##

backend-volto/.flake8

@@ -0,0 +1,22 @@
+# Generated from:
+# https://github.com/plone/meta/tree/master/config/default
+# See the inline comments on how to expand/tweak this configuration file
+[flake8]
+doctests = 1
+ignore =
+    # black takes care of line length
+    E501,
+    # black takes care of where to break lines
+    W503,
+    # black takes care of spaces within slicing (list[:])
+    E203,
+    # black takes care of spaces after commas
+    E231,
+
+##
+# Add extra configuration options in .meta.toml:
+#  [flake8]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##

backend-volto/.gitignore

@@ -1,44 +1,51 @@
-.coverage
+# Generated from:
+# https://github.com/plone/meta/tree/master/config/default
+# See the inline comments on how to expand/tweak this configuration file
+# python related
 *.egg-info
-*.log
-*.mo
-*.py?
-*.swp
-# dirs
+*.pyc
+*.pyo
+
+# tools related
+build/
+.coverage
+coverage.xml
+dist/
+docs/_build
+__pycache__/
+.tox
+.vscode/
+node_modules/
+
+# venv / buildout related
 bin/
-buildout-cache/
-data/*.json
 develop-eggs/
 eggs/
+.eggs/
 etc/
-htmlcov/
+.installed.cfg
 include/
-instance/
 lib/
-lib64/
-local/
-node_modules/
-parts/
-src/plone6demo/setuphandlers/data/*.json
-dist/*
-test.plone_addon/
-var/
-# files
-.installed.cfg
-.mr.developer.cfg
 lib64
-log.html
-output.xml
-pip-selfcheck.json
-report.html
-.vscode/
-.tox/
-reports/
-venv/
-*-mxdev.txt
-# excludes
-live.cfg
-inituser
-pip-wheel-metadata
+.mr.developer.cfg
+parts/
 pyvenv.cfg
-instance-local.yaml
+var/
+
+# mxdev
+/instance/
+/.make-sentinels/
+/*-mxdev.txt
+/reports/
+/sources/
+/venv/
+.installed.txt
+.lock
+
+##
+# Add extra configuration options in .meta.toml:
+#  [gitignore]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##

backend-volto/.pre-commit-config.yaml

@@ -0,0 +1,94 @@
+# Generated from:
+# https://github.com/plone/meta/tree/master/config/default
+# See the inline comments on how to expand/tweak this configuration file
+ci:
+    autofix_prs: false
+    autoupdate_schedule: monthly
+
+repos:
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v3.14.0
+    hooks:
+    -   id: pyupgrade
+        args: [--py38-plus]
+-   repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+    -   id: isort
+-   repo: https://github.com/psf/black
+    rev: 23.9.1
+    hooks:
+    -   id: black
+-   repo: https://github.com/collective/zpretty
+    rev: 3.1.0
+    hooks:
+    -   id: zpretty
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pre_commit]
+#  zpretty_extra_lines = """
+#  _your own configuration lines_
+#  """
+##
+-   repo: https://github.com/PyCQA/flake8
+    rev: 6.1.0
+    hooks:
+    -   id: flake8
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pre_commit]
+#  flake8_extra_lines = """
+#  _your own configuration lines_
+#  """
+##
+-   repo: https://github.com/codespell-project/codespell
+    rev: v2.2.6
+    hooks:
+    -   id: codespell
+        additional_dependencies:
+          - tomli
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pre_commit]
+#  codespell_extra_lines = """
+#  _your own configuration lines_
+#  """
+##
+-   repo: https://github.com/mgedmin/check-manifest
+    rev: "0.49"
+    hooks:
+    -   id: check-manifest
+-   repo: https://github.com/regebro/pyroma
+    rev: "4.2"
+    hooks:
+    -   id: pyroma
+-   repo: https://github.com/mgedmin/check-python-versions
+    rev: "0.21.3"
+    hooks:
+    -   id: check-python-versions
+        args: ['--only', 'setup.py,pyproject.toml']
+-   repo: https://github.com/collective/i18ndude
+    rev: "6.1.0"
+    hooks:
+    -   id: i18ndude
+
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pre_commit]
+#  i18ndude_extra_lines = """
+#  _your own configuration lines_
+#  """
+##
+
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pre_commit]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##

backend-volto/CHANGES.md

@@ -0,0 +1,10 @@
+# Changelog
+
+<!--
+   You should *NOT* be adding new change log entries to this file.
+   You should create a file in the news directory instead.
+   For helpful instructions, please see:
+   https://github.com/plone/plone.releaser/blob/master/ADD-A-NEWS-ITEM.rst
+-->
+
+<!-- towncrier release notes start -->

backend-volto/CONTRIBUTORS.md

@@ -0,0 +1,3 @@
+# Contributors
+
+- Plone Foundation [[email protected]]

backend-volto/Dockerfile

@@ -1,29 +1,44 @@
 # syntax=docker/dockerfile:1
 ARG SEED=1000
-ARG PLONE_VERSION=6.0.13
-FROM plone/plone-backend:${PLONE_VERSION}
+ARG PLONE_VERSION=6.1.0b1
+FROM plone/server-builder:${PLONE_VERSION} AS builder
 
+WORKDIR /app
 
-LABEL maintainer="Plone Foundation <[email protected]>" \
-    org.label-schema.name="demo-backend-volto" \
-    org.label-schema.description="Plone 6 Demo Plain Volto Site backend image." \
-    org.label-schema.vendor="Plone Foundation"
 
 # Add local code
-COPY . .
+COPY scripts/ scripts/
+COPY . src
 
-# Install local requirements and fix permissions
+# Install local requirements and pre-compile mo files
 RUN <<EOT
-    ./bin/pip install mxdev
-    mv requirements-docker.txt requirements.txt
-    ./bin/mxdev -c mx.ini
-    ./bin/pip install -r requirements-mxdev.txt
-    chown -R plone: /app
+    set -e
+    bin/pip install mxdev uv
+    mv src/requirements-docker.txt src/requirements.txt
+    sed -i 's/-e .\[test\]/./g' src/mx.ini
+    cd /app/src
+    # remove potentially existing virtualenv from local build
+    rm -rf .venv
+    ../bin/mxdev -c mx.ini
+    ../bin/uv pip install -r requirements-mxdev.txt
+    ../bin/python /compile_mo.py
+    cd /app
+    rm -Rf src/
 EOT
 
-# Create a new site with content
+FROM plone/server-prod-config:${PLONE_VERSION}
+
+LABEL maintainer="Plone Foundation <[email protected]>" \
+    org.label-schema.name="demo-backend-volto" \
+    org.label-schema.description="Plone 6 Demo Plain Volto Site backend image." \
+    org.label-schema.vendor="Plone Foundation"
+
+# Copy /app from builder
+COPY --from=builder /app /app
+
 RUN <<EOT
-    SEED=${SEED}
-    ADDITIONAL_PROFILES=plone6demo:initial
-    ./docker-entrypoint.sh create-site
+    set -e
+    ln -s /data /app/var
+    cat ${SEED} > /app/__created__.txt
+    SEED=${SEED} ./docker-entrypoint.sh create-site
 EOT