Update from main branch

.github/workflows/black.yml

@@ -26,9 +26,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
 
-      # install black
+      # install black (extract version from versions.cfg)
       - name: install black
-        run: pip install black
+        run: pip install click==8.0.4 black==$(awk '/^black =/{print $NF}' versions.cfg)
 
       # run black
       - name: run black

.github/workflows/tests.yml

@@ -1,32 +1,32 @@
-name: plone.rest CI
+name: Tests
 on: [push]
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.7, 2.7]
-        plone-version: [5.2, 5.1, 4.3]
+        python-version: ["3.12", "3.11", "3.10", "3.9", "3.8"]
+        plone-version: ["6.0", "5.2"]
         exclude:
-          - python-version: 3.7
-            plone-version: 4.3
-          - python-version: 3.7
-            plone-version: 5.1
-          - python-version: 3.8
-            plone-version: 4.3
-          - python-version: 3.8
-            plone-version: 5.1
+          - python-version: 3.12
+            plone-version: 5.2
+          - python-version: 3.11
+            plone-version: 5.2
+          - python-version: 3.10
+            plone-version: 5.2
+          - python-version: 3.9
+            plone-version: 5.2
     steps:
-
       # git checkout
       - uses: actions/checkout@v2
 
       # 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
@@ -40,13 +40,11 @@ jobs:
       - run: pip install virtualenv
       - run: pip install wheel
       - name: pip install
-        run: pip install -r requirements.txt
-      - name: choose Plone version
-        run: sed -ie "s#plone-x.x.x.cfg#plone-${{ matrix.plone-version }}.x.cfg#" ci.cfg
+        run: pip install -r requirements-${{ matrix.plone-version }}.txt
 
       # buildout
       - name: buildout
-        run: buildout -t 10 -c ci.cfg
+        run: buildout -t 10 -c plone-${{ matrix.plone-version }}.x.cfg
         env:
           CI: true
 

.gitignore

@@ -17,6 +17,7 @@
 /.Python
 /include
 /lib
+/lib64
 /.mr.developer.cfg
 *.mo
 local/

.pre-commit-config.yaml

@@ -0,0 +1,38 @@
+# Generated from:
+# https://github.com/plone/meta/tree/master/config/default
+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/PyCQA/flake8
+    rev: 6.1.0
+    hooks:
+      - id: flake8
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.6
+    hooks:
+      - id: codespell
+        additional_dependencies:
+          - tomli
+  - 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

CHANGES.rst

@@ -8,6 +8,124 @@ Changelog
 
 .. towncrier release notes start
 
+4.1.1 (2023-10-23)
+------------------
+
+Internal:
+
+
+- Fix test leakage, enabling the publication check when it shouldn't be active. @jaroel (#168)
+
+
+4.1.0 (2023-10-18)
+------------------
+
+New features:
+
+
+- Add support for Python 3.12. @tisto (#167)
+
+
+Bug fixes:
+
+
+- Make REST endpoints check for acquired items. @jaroel (#166)
+
+
+4.0.0 (2023-09-22)
+------------------
+
+Breaking changes:
+
+
+- Drop support for Python 2.7, 3.6, and 3.7 @tisto (#141)
+
+
+3.0.1 (2023-09-21)
+------------------
+
+Bug fixes:
+
+
+- When ``++api++`` is in the url multiple times, redirect to the proper url.
+  When the url is badly formed, for example ``++api++/something/++api++``, give a 404 NotFound.
+  Fixes a denial of service.
+  See `security advisory <https://github.com/plone/plone.rest/security/advisories/GHSA-h6rp-mprm-xgcq>`_.
+  [maurits] (#1)
+
+
+3.0.0 (2023-01-29)
+------------------
+
+Breaking changes:
+
+
+- Change the HTTP status from 301 (Moved Permanently) to 302 (Found) for GET requests and to 307 (Temporary Redirect) for other request methods.
+  This fixes problems when an existing redirect is re-used.
+  [mamico] (#135)
+- Drop official support for Plone 4.3, 5.0 and 5.1 (most likely the package will continue to work though)
+  [tisto] (#140)
+
+
+New features:
+
+
+- Add official support for Plone 6
+  [tisto] (#143)
+- Add official support for Python 3.9, 3.10, and 3.11
+  [tisto] (#147)
+
+
+2.0.0 (2022-10-15)
+------------------
+
+Bug fixes:
+
+
+- Re-release 2.0.0a6 as 2.0.0 [tisto] (#136)
+
+
+2.0.0a5 (2022-04-07)
+--------------------
+
+Bug fixes:
+
+
+- Fix an infinite loop with redirections from parent to child [ericof] (#133)
+
+
+2.0.0a4 (2022-03-24)
+--------------------
+
+Bug fixes:
+
+
+- ++api++ traverser should be kept on 30x redirections [mamico] (#132)
+
+
+2.0.0a3 (2022-02-12)
+--------------------
+
+Bug fixes:
+
+
+- ++api++ traverser should be kept on 30x redirections [mamico] (#127)
+
+
+2.0.0a2 (2022-01-25)
+--------------------
+
+Bug fixes:
+
+
+- Fix typo in `README.rst` [jensens] (#123)
+- Use document_view as default for site root.
+  [agitator] (#126)
+- Resolve all the deprecation warnings that originate in this package's code that are
+  exposed by running the tests that do not stem from backwards compatibility we support.
+  [rpatterson] (#128)
+
+
 2.0.0a1 (2021-10-05)
 --------------------
 
@@ -151,7 +269,7 @@ Bugfixes:
   [buchi]
 
 - Fallback to regular views during traversal to ensure compatibility with
-  views beeing called with a specific Accept header.
+  views being called with a specific Accept header.
   [buchi]
 
 
@@ -201,7 +319,7 @@ Bugfixes:
 
 - Refactor traversal of REST requests by using a traversal adapter on the site
   root instead of a traversal adapter for each REST service. This prevents
-  REST services from being overriden by other traversal adapters.
+  REST services from being overridden by other traversal adapters.
   [buchi]
 
 

MANIFEST.in

@@ -6,7 +6,9 @@ exclude .flake8
 exclude bootstrap-buildout.py
 exclude Makefile
 exclude requirements.txt
+exclude requirements-*.txt
 exclude CODEOWNERS
+exclude .pre-commit-config.yaml
 global-exclude *.pyc
 include pyproject.toml
 recursive-exclude news *

Makefile

@@ -3,7 +3,7 @@
 SHELL := /bin/bash
 CURRENT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
-version = 3
+version = 3.9
 
 # We like colors
 # From: https://coderwall.com/p/izxssa/colored-makefile-for-golang-projects
@@ -12,7 +12,7 @@ GREEN=`tput setaf 2`
 RESET=`tput sgr0`
 YELLOW=`tput setaf 3`
 
-all: .installed.cfg
+all: build-plone-6.0
 
 # Add the following 'help' target to your Makefile
 # And add help text after each target name starting with '\#\#'
@@ -36,7 +36,7 @@ update: ## Update Make and Buildout
 bin/buildout: bin/pip
 	bin/pip install --upgrade pip
 	bin/pip install -r requirements.txt
-	bin/pip install black || true
+	bin/pip install pip install black==$$(awk '/^black =/{print $$NF}' versions.cfg)
 	@touch -c $@
 
 bin/python bin/pip:
@@ -83,6 +83,13 @@ build-plone-5.2-performance: .installed.cfg  ## Build Plone 5.2
 	bin/pip install -r requirements.txt
 	bin/buildout -c plone-5.2.x-performance.cfg
 
+build-plone-6.0:  ## Build Plone 6.0
+	python$(version) -m venv .
+	bin/pip install --upgrade pip
+	bin/pip install -r requirements-6.0.txt
+	bin/pip install pip install black==$$(awk '/^black =/{print $$NF}' versions.cfg)
+	bin/buildout -c plone-6.0.x.cfg
+
 .PHONY: Test
 test:  ## Test
 	bin/test