Plone 6 compatibility (#60)

---------

Co-authored-by: sdelcourt <simon.delcourt@imio.be>

Author: duchenean

.github/workflows/python-package.yml

@@ -1,19 +1,26 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Python package
+name: Push tests
+# run-name: ${{ github.actor }} push tests
 
 on:
   push:
   pull_request:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        PLONE_VERSION: [ 4.3, 5.1, 5.2 ]
+        include:
+          - python: 2.7.18
+            plone: 4.3
+          - python: 3.7.14
+            plone: 5.2
+          - python: 3.10.11
+            plone: "6.0"
     services:
       libreoffice:
         image: imiobe/libreoffice:7.3
@@ -24,51 +31,46 @@ jobs:
           - /var/tmp:/var/tmp
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up pyenv and Python
-        uses: "gabrielfalcao/pyenv-action@v14"
-        with:
-          default: 2.7.18
-          versions: 3.8.16
-          command: pyenv -v
+        uses: actions/checkout@v3
       - name: Setup Env
         run: |
           mkdir -p -m 777 /tmp/appy/
           sudo add-apt-repository ppa:libreoffice/ppa -y
           sudo apt update -qq -y
           sudo apt-get install -qq -y libreoffice libreoffice-script-provider-python
-          sudo apt-get autoremove -qq -y
-          sudo apt-get autoclean -qq -y
           mkdir -p buildout-cache/{eggs,downloads}
-          pip install -r requirements.txt
+      - name: Set up pyenv and Python
+        uses: "gabrielfalcao/pyenv-action@v14"
+        with:
+          default: "${{ matrix.python }}"
+      - name: Setup Python env
+        run: |
+          pip install --upgrade pip
+          pip install -r requirements-${{ matrix.plone }}.txt
       - name: Cache eggs
         uses: actions/cache@v2
         env:
           cache-name: cache-eggs
         with:
           path: ~/buildout-cache/eggs
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.PLONE_VERSION }}
-          restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.PLONE_VERSION }}
+          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ matrix.plone }}
+          restore-keys: ${{ runner.os }}-test-${{ env.cache-name }}-${{ matrix.plone }}
       - name: buildout
         run: |
-          sed -ie "s#plone-5#plone-${{matrix.PLONE_VERSION}}#" test-ci.cfg
-          pip install -r requirements.txt coverage==5.3.1
-          buildout -c test-ci.cfg annotate
-          buildout -c test-ci.cfg
-          bin/translation-manage -c
-      - name: code-analysis
-        run: |
-          bin/code-analysis
+          sed -ie "s#test.cfg#test-${{matrix.plone}}.cfg#" gha.cfg
+          buildout -c gha.cfg annotate
+          buildout -c gha.cfg
       - name: test
         run: |
-          docker ps -a
-          bin/test --test=\!"robot"
+          bin/test -t !robot
   coverage:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        PLONE_VERSION: [5.2]
+        include:
+          - python: 3.10.11
+            plone: "6.0"
     services:
       libreoffice:
         image: imiobe/libreoffice:7.3
@@ -79,49 +81,41 @@ jobs:
           - /var/tmp:/var/tmp
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up pyenv and Python
-        uses: "gabrielfalcao/pyenv-action@v14"
-        with:
-          default: 2.7.18
-          versions: 3.8.16
-          command: pyenv -v
+        uses: actions/checkout@v3
       - name: Setup Env
         run: |
           mkdir -p -m 777 /tmp/appy/
           sudo add-apt-repository ppa:libreoffice/ppa -y
           sudo apt update -qq -y
           sudo apt-get install -qq -y libreoffice libreoffice-script-provider-python
-          sudo apt-get autoremove -qq -y
-          sudo apt-get autoclean -qq -y
           mkdir -p buildout-cache/{eggs,downloads}
-          pip install -r requirements.txt
+      - name: Set up pyenv and Python
+        uses: "gabrielfalcao/pyenv-action@v14"
+        with:
+          default: "${{ matrix.python }}"
+      - name: Setup Python env
+        run: |
+          pip install --upgrade pip
+          pip install -r requirements-${{ matrix.plone }}.txt
+          pip install -U coveralls
       - name: Cache eggs
         uses: actions/cache@v2
         env:
           cache-name: cache-eggs
         with:
           path: ~/buildout-cache/eggs
-          key: ${{ runner.os }}-coverage-${{ env.cache-name }}-${{ matrix.PLONE_VERSION }}
-          restore-keys: ${{ runner.os }}-coverage-${{ env.cache-name }}-${{ matrix.PLONE_VERSION }}
+          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ matrix.plone }}
+          restore-keys: ${{ runner.os }}-test-${{ env.cache-name }}-${{ matrix.plone }}
       - name: buildout
         run: |
-          sed -ie "s#plone-5#plone-${{matrix.PLONE_VERSION}}#" test-ci.cfg
-          pip install -r requirements.txt coverage==5.3.1
-          buildout -c test-ci.cfg annotate
-          buildout -c test-ci.cfg
-          bin/translation-manage -c
-      - name: test coverage
+          sed -ie "s#test.cfg#test-${{matrix.plone}}.cfg#" gha.cfg
+          buildout -c gha.cfg
+      - name: code-analysis
         run: |
-          bin/coverage run bin/test --test=\!"robot"
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-      - name: Install Coveralls
+          bin/code-analysis
+      - name: test coverage
         run: |
-          pip3 install -U pip setuptools --no-cache-dir
-          pip3 install -U "coveralls>=3.0.0" coverage==5.3.1 --no-cache-dir
+          bin/coverage run bin/test -t !robot
       - name: Publish to Coveralls
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGES.rst

@@ -1,10 +1,11 @@
 Changelog
 =========
 
-3.44 (unreleased)
------------------
+4.0 (unreleased)
+----------------
 
-- Nothing changed yet.
+- Python 3, Plone 5.2 and Plone 6.0 compatible.
+  [aduchene]
 
 
 3.43 (2024-04-10)

Makefile

@@ -5,7 +5,7 @@ lo_version="7.3"
 args = $(filter-out $@,$(MAKECMDGOALS))
 
 all: run
-py:=2.7
+py:=3.9
 
 .PHONY: bootstrap buildout run test cleanall startlibreoffice stoplibreoffice
 bootstrap:

buildout.d/base.cfg base.cfgbuildout.d/base.cfg renamed to base.cfg

@@ -5,9 +5,6 @@ package-extras = [test]
 show-picked-versions = true
 allow-picked-versions = true
 
-extends =
-    versions.cfg
-
 develop = .
 
 eggs +=

buildout.cfg

@@ -1,5 +1,36 @@
 [buildout]
 extends =
-    buildout.d/plone-5.2.x.cfg
-#    buildout.d/plone-5.1.x.cfg
-#    buildout.d/plone-4.3.x.cfg
+    https://raw.github.com/collective/buildout.plonetest/master/test-6.0.x.cfg
+    development.cfg
+
+auto-checkout +=
+    plone.restapi
+
+[sources]
+collective.excelexport = git ${remotes:collective}/collective.excelexport.git pushurl=${remotes:collective_push}/collective.excelexport.git branch=plone6
+appy = git ${remotes:imio}/appy.git pushurl=${remotes:imio_push}/appy.git branch=python3
+plone.restapi = git ${remotes:plone}/plone.restapi.git pushurl=${remotes:plone_push}/plone.restapi.git branch=main
+imio.helpers = git ${remotes:imio}/imio.helpers.git pushurl=${remotes:imio_push}/imio.helpers.git branch=plone6
+
+[versions]
+appy =
+# to keep prompt-toolkit < 3
+ipython = 8.3.0
+
+ipdb = 0.13.9
+iw.debug = 0.3
+jedi = 0.18.1
+parso = 0.8.3
+
+# Required by:
+# ipdb
+asttokens = 2.0.8
+backcall = 0.2.0
+executing = 1.1.1
+matplotlib-inline = 0.1.6
+pexpect = 4.8.0
+pickleshare = 0.7.5
+ptyprocess = 0.7.0
+pure-eval = 0.2.2
+stack-data = 0.5.1
+traitlets = 5.4.0

buildout.d/plone-4.3.x.cfg

@@ -47,6 +47,8 @@ imio = https://github.com/imio
 imio_push = git@github.com:imio
 collective = https://github.com/collective
 collective_push = git@github.com:collective
+plone = https://github.com/plone
+plone_push = git@github.com:plone
 
 [sources]
 collective.big.bang = git ${remotes:collective}/collective.big.bang.git pushurl=${remotes:collective_push}/collective.big.bang.git branch=main

buildout.d/plone-5.1.x.cfg

@@ -0,0 +1,4 @@
+[buildout]
+extends =
+    test.cfg
+eggs-directory = ~/buildout-cache/eggs