Merge from 'master'

.flake8

@@ -5,3 +5,5 @@ max-line-length = 100000
 extend-ignore =
     # See https://github.com/PyCQA/pycodestyle/issues/373
     E203,
+per-file-ignores =
+    src/plone/restapi/bbb.py:F401

.github/workflows/black.yml

@@ -1,7 +1,8 @@
 name: Black
-on: [push]
+on: [push,pull_request]
 jobs:
   build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -10,25 +11,18 @@ jobs:
 
     steps:
       # git checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+          cache: pip
 
-      # python cache
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-
-      # install black (extract version from versions.cfg)
+      # install black (with constraints)
       - name: install black
-        run: pip install click==$(awk '/^click =/{print $NF}' versions.cfg) black==$(awk '/^black =/{print $NF}' versions.cfg)
+        run: pip install -c constraints.txt black
 
       # run black
       - name: run black

.github/workflows/flake8.yml

@@ -1,7 +1,8 @@
 name: Flake 8
-on: [push]
+on: [push,pull_request]
 jobs:
   build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -10,25 +11,18 @@ jobs:
 
     steps:
       # git checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-
-      # python cache
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          cache: pip
 
       # install flake8
       - name: install flake8
-        run: pip install flake8==$(awk '/^flake8 =/{print $NF}' versions.cfg)
+        run: pip install -c constraints.txt flake8
 
       # run black
       - name: run flake8

.github/workflows/pyroma.yml

@@ -1,7 +1,8 @@
 name: Pyroma
-on: [push]
+on: [push,pull_request]
 jobs:
   build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -10,21 +11,14 @@ jobs:
 
     steps:
       # git checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-
-      # python cache
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          cache: pip
 
       # install pyroma
       - name: install pyroma

.github/workflows/tests.yml

@@ -1,42 +1,45 @@
 name: Tests
-on: [push]
+on: [push,pull_request]
 jobs:
   build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-          - python-version: '3.6'
-            plone-version: '5.2'
           - python-version: '3.7'
             plone-version: '5.2'
           - python-version: '3.8'
             plone-version: '5.2'
-          - python-version: '3.7'
-            plone-version: '6.0'
           - python-version: '3.8'
             plone-version: '6.0'
           - python-version: '3.9'
             plone-version: '6.0'
+          - python-version: '3.10'
+            plone-version: '6.0'
+          - python-version: '3.11'
+            plone-version: '6.0'
 
     steps:
       # git checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
 
-      # python cache
-      - uses: actions/cache@v1
+      # buildout eggs cache
+      - uses: actions/cache@v3
         with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          path: eggs
+          key: ${{ runner.os }}-py${{ matrix.python-version }}-plone${{ matrix.plone-version }}-${{ hashFiles('*.cfg') }}
           restore-keys: |
-            ${{ runner.os }}-pip-
+            ${{ runner.os }}-py${{ matrix.python-version }}-plone${{ matrix.plone-version }}-
+            ${{ runner.os }}-py${{ matrix.python-version }}-
 
       # python install
       - run: pip install virtualenv
@@ -46,14 +49,10 @@ jobs:
 
       # buildout
       - name: buildout
-        run: buildout -t 10 -c plone-${{ matrix.plone-version }}.x.cfg code-analysis:return-status-codes=True
+        run: buildout -t 10 -c plone-${{ matrix.plone-version }}.x.cfg
         env:
           CI: true
 
-      # code analysis
-      - name: code analysis
-        run: bin/code-analysis
-
       # build sphinx
       - name: sphinx
         run: if [ "${{ matrix.plone-version }}" == "6.0" ] && [ ${{ matrix.python-version }} == '3.9' ]; then make docs-html; fi
@@ -62,13 +61,13 @@ jobs:
       - name: test
         run: bin/test
 
-      # test no uncommited changes
-      - name: test no uncommited changes
+      # test no uncommitted changes
+      - name: test no uncommitted changes
         run: ./test-no-uncommitted-doc-changes
         env:
           PYTHON_VERSION: ${{ matrix.python-version }}
           PLONE_VERSION: ${{ matrix.plone-version }}
 
       # test for broken links
       - name: linkcheck
-        run: if [ "${{ matrix.plone-version }}" == "6.0" ] && [ ${{ matrix.python-version }} == '3.9' ]; then make docs-linkcheckbroken; fi
+        run: if [ "${{ matrix.plone-version }}" == "6.0" ] && [ ${{ matrix.python-version }} == '3.9' ]; then make docs-linkcheckbroken; fi

.github/workflows/update_remote_docs.yml

@@ -0,0 +1,19 @@
+name: Trigger build and deploy of Plone 6 documentation
+
+on:
+  push:
+    branches:
+      - "master"
+    paths:
+      - "docs/*"
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          curl -X POST \
+          -H "Authorization: Bearer ${{secrets.DOCUMENTATION_BUILD_APPLICATION_KEY}}" \
+          -H "Accept: application/vnd.github.v3+json" \
+          https://api.github.com/repos/plone/documentation/actions/workflows/update_submodule.yml/dispatches \
+          -d '{"ref": "6-dev"}'

.github/workflows/zpretty.yml

@@ -1,7 +1,8 @@
 name: zpretty
-on: [push]
+on: [push,pull_request]
 jobs:
   build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -10,21 +11,14 @@ jobs:
 
     steps:
       # git checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-
-      # python cache
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          cache: pip
 
       # install zpretty
       - name: install zpretty

.gitignore

@@ -24,11 +24,14 @@ docs/.DS_Store
 /lib
 /lib64
 /local
+/venv
 /.mr.developer.cfg
 *.mo
 docs/_build
 docs/plone.restapi.http-examples
 docs/source/README.rst
+docs/Makefile
+docs/make.bat
 sphinx_build.log
 htmlcov
 npm-debug.log