Configuring with plone.meta (#1945)

* Configuring with plone.meta

* Update http-examples to Plone 6.2.

* Some json files get an extra "context" url.
* "lock" is no longer an empty dict, but `{"locked": false, "stealable": true}`
* `plone.app.layout` has a GS profile now.  See also plone/plone.classicui#23

---------

Co-authored-by: Maurits van Rees <[email protected]>

Author: gforcada

.github/workflows/test-matrix.yml

@@ -5,11 +5,6 @@ name: Tests
 
 on:
   push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
 
 jobs:
   build:
@@ -33,6 +28,7 @@ jobs:
         - ["3.8", "5.2 on py3.8", "py38-plone52"]
 
     runs-on: ${{ matrix.os[1] }}
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: ${{ matrix.config[1] }}
     steps:
     - uses: actions/checkout@v5
@@ -55,5 +51,10 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install tox
+    - name: Initialize tox
+      # the bash one-liner below does not work on Windows
+      if: contains(matrix.os, 'ubuntu')
+      run: |
+        if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
     - name: Test
       run: tox -e ${{ matrix.config[2] }}

.gitignore

@@ -48,6 +48,7 @@ local.cfg
 /venv/
 .installed.txt
 
+/docs/styles/Microsoft/
 
 ##
 # Add extra configuration options in .meta.toml:
@@ -56,4 +57,3 @@ local.cfg
 #  _your own configuration lines_
 #  """
 ##
-/docs/styles/Microsoft

.meta.toml

@@ -3,7 +3,7 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "2.0.1.dev0"
+commit-id = "2.1.0"
 
 [editorconfig]
 extra_lines = """

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ ci:
 
 repos:
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.1
+    rev: v3.20.0
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]
@@ -20,7 +20,7 @@ repos:
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
-    rev: 3.1.0
+    rev: 3.1.1
     hooks:
     -   id: zpretty
 
@@ -32,7 +32,7 @@ repos:
 #  """
 ##
 -   repo: https://github.com/PyCQA/flake8
-    rev: 7.1.2
+    rev: 7.3.0
     hooks:
     -   id: flake8
 
@@ -62,7 +62,7 @@ repos:
     hooks:
     -   id: check-manifest
 -   repo: https://github.com/regebro/pyroma
-    rev: "4.2"
+    rev: "5.0"
     hooks:
     -   id: pyroma
 -   repo: https://github.com/mgedmin/check-python-versions

news/+meta.internal

@@ -0,0 +1 @@
+Update configuration files @plone

pyproject.toml

@@ -2,7 +2,7 @@
 # https://github.com/plone/meta/tree/main/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 [build-system]
-requires = ["setuptools>=68.2,<=75.8.0"]
+requires = ["setuptools>=68.2,<80", "wheel"]
 
 [tool.towncrier]
 directory = "news/"
@@ -39,7 +39,7 @@ showcontent = true
 
 [[tool.towncrier.type]]
 directory = "tests"
-name = "Tests"
+name = "Tests:"
 showcontent = true
 
 ##

src/plone/restapi/tests/http-examples/404_not_found.resp

@@ -2,6 +2,7 @@ HTTP/1.1 404 Not Found
 Content-Type: application/json
 
 {
+    "context": "http://localhost:55001/plone",
     "message": "Resource not found: http://localhost:55001/plone/non-existing-resource",
     "type": "NotFound"
 }

src/plone/restapi/tests/http-examples/navroot_lang_content_get.resp

@@ -24,7 +24,10 @@ Content-Type: application/json
             "token": "en"
         },
         "layout": "folder_listing",
-        "lock": {},
+        "lock": {
+            "locked": false,
+            "stealable": true
+        },
         "modified": "1995-07-31T17:30:00+00:00",
         "next_item": {},
         "parent": {

src/plone/restapi/tests/http-examples/navroot_lang_folder_get.resp

@@ -24,7 +24,10 @@ Content-Type: application/json
             "token": "en"
         },
         "layout": "folder_listing",
-        "lock": {},
+        "lock": {
+            "locked": false,
+            "stealable": true
+        },
         "modified": "1995-07-31T17:30:00+00:00",
         "next_item": {},
         "parent": {

src/plone/restapi/tests/http-examples/relations_del_anonymous.resp

@@ -2,6 +2,7 @@ HTTP/1.1 401 Unauthorized
 Content-Type: application/json
 
 {
+    "context": "http://localhost:55001/plone",
     "message": "You are not authorized to access this resource.",
     "type": "Unauthorized"
 }