From e9926daf97ee7f77c08ca9f1ebe7b6d22509c997 Mon Sep 17 00:00:00 2001 From: Fred van Dijk Date: Sun, 14 Apr 2024 15:25:41 +0200 Subject: [PATCH 01/10] Update GHA ci, check with python 3.12 --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 61c32c6..3eecfae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,15 +15,16 @@ jobs: - "3.9" - "3.10" - "3.11" + - "3.12" plone: - "6.0-dev" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Plone ${{ matrix.plone }} with Python ${{ matrix.python }} id: setup - uses: plone/setup-plone@v1.0.0 + uses: plone/setup-plone@v2 with: python-version: ${{ matrix.python }} plone-version: ${{ matrix.plone }} From 1759c54bb5db5bd09ebf03dd477d6aaa8356f903 Mon Sep 17 00:00:00 2001 From: Fred van Dijk Date: Sun, 14 Apr 2024 15:29:28 +0200 Subject: [PATCH 02/10] just checking, this is allowed as version? --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3eecfae..8ddbcef 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Plone ${{ matrix.plone }} with Python ${{ matrix.python }} id: setup - uses: plone/setup-plone@v2 + uses: plone/setup-plone@2 with: python-version: ${{ matrix.python }} plone-version: ${{ matrix.plone }} From bc57d8439b79a51661acb4401cfb4bb11b06e847 Mon Sep 17 00:00:00 2001 From: Fred van Dijk Date: Sun, 14 Apr 2024 15:30:34 +0200 Subject: [PATCH 03/10] Ok, so we have to specify vull semver here? --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8ddbcef..65e01da 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Plone ${{ matrix.plone }} with Python ${{ matrix.python }} id: setup - uses: plone/setup-plone@2 + uses: plone/setup-plone@v2.0.0 with: python-version: ${{ matrix.python }} plone-version: ${{ matrix.plone }} From 5a7a632b81a3980e61916d6ffcc22a105fc67524 Mon Sep 17 00:00:00 2001 From: Fred van Dijk Date: Sun, 14 Apr 2024 15:44:56 +0200 Subject: [PATCH 04/10] Replace configparser.readfp with readfile for Python 3.12 compatibility --- docs/155.bugfix | 1 + src/collective/taxonomy/exportimport.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 docs/155.bugfix diff --git a/docs/155.bugfix b/docs/155.bugfix new file mode 100644 index 0000000..f80359b --- /dev/null +++ b/docs/155.bugfix @@ -0,0 +1 @@ +Replace configparser.readfp with readfile for Python 3.12 compatibility [@fredvd] diff --git a/src/collective/taxonomy/exportimport.py b/src/collective/taxonomy/exportimport.py index e0b98a3..4e19312 100644 --- a/src/collective/taxonomy/exportimport.py +++ b/src/collective/taxonomy/exportimport.py @@ -17,7 +17,7 @@ def parseConfigFile(data): except Exception as exception: raise exception - config.readfp(StringIO(data.decode("utf-8"))) + config.read_file(StringIO(data.decode("utf-8"))) return config From b57b1699fdc89ab1c90de1f3ef5c32b9f18a28de Mon Sep 17 00:00:00 2001 From: Fred van Dijk Date: Sun, 14 Apr 2024 15:53:59 +0200 Subject: [PATCH 05/10] Try updating to Pillow 10.3.0 for Python 3.12 support --- mx.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/mx.ini b/mx.ini index 6627996..b760c9b 100644 --- a/mx.ini +++ b/mx.ini @@ -18,6 +18,7 @@ ignores = collective.taxonomy version-overrides = + Pillow==10.3.0 default-install-mode = direct From a46e3790ff99fba9d4328ebf29eedb86b5b07365 Mon Sep 17 00:00:00 2001 From: Fred van Dijk Date: Sun, 14 Apr 2024 15:59:12 +0200 Subject: [PATCH 06/10] Ah, we were still testing agaings 6.0-dev from June 22 --- .github/workflows/main.yml | 2 +- mx.ini | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 65e01da..140a2e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: - "3.11" - "3.12" plone: - - "6.0-dev" + - "6.0-latest" steps: - uses: actions/checkout@v4 diff --git a/mx.ini b/mx.ini index b760c9b..3cd7bf6 100644 --- a/mx.ini +++ b/mx.ini @@ -17,8 +17,7 @@ ignores = wheel collective.taxonomy -version-overrides = - Pillow==10.3.0 +# version-overrides = default-install-mode = direct From 82ca1a9f2337d6bc23b0bd9f418000aa9596cc86 Mon Sep 17 00:00:00 2001 From: Fred van Dijk Date: Sun, 14 Apr 2024 16:16:28 +0200 Subject: [PATCH 07/10] Add setuptools as python3.12 venv no longer installs it --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 140a2e7..40c8c10 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: with: python-version: ${{ matrix.python }} plone-version: ${{ matrix.plone }} - + additional-eggs: 'setuptools' - name: Install package run: | make install From 01bac7caef75292f24c7f39f2824829228d383bb Mon Sep 17 00:00:00 2001 From: Fred van Dijk Date: Sun, 14 Apr 2024 16:22:47 +0200 Subject: [PATCH 08/10] Also use latest instead of -dev in the constraints --- constraints.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constraints.txt b/constraints.txt index c0e8f2f..228b6cc 100644 --- a/constraints.txt +++ b/constraints.txt @@ -1 +1 @@ --c https://dist.plone.org/release/6.0-dev/constraints.txt +-c https://dist.plone.org/release/6.0-latest/constraints.txt From 1ae8628fca3aca5399d009258cc0ed6ff736e1c8 Mon Sep 17 00:00:00 2001 From: Fred van Dijk Date: Sun, 14 Apr 2024 16:35:13 +0200 Subject: [PATCH 09/10] Last attempt. something is flakey with the setuptools version being installed for Python 3.12. --- mx.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mx.ini b/mx.ini index 3cd7bf6..fd24c7b 100644 --- a/mx.ini +++ b/mx.ini @@ -12,12 +12,12 @@ requirements-out = requirements-mxdev.txt # ignore own dev-package from existing constraints # because it is pinned in the plone-release ignores = - setuptools pip wheel collective.taxonomy -# version-overrides = +version-overrides = + setuptools==69.5.1 default-install-mode = direct From 7882b8903b7be8dacdca0c96a0907a1b09176f1d Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Tue, 16 Apr 2024 11:31:40 +0200 Subject: [PATCH 10/10] Try specifying setuptool-version 69.5.1 in setup-plone action. --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 40c8c10..30d98f3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,6 +28,7 @@ jobs: with: python-version: ${{ matrix.python }} plone-version: ${{ matrix.plone }} + setuptools-version: 69.5.1 additional-eggs: 'setuptools' - name: Install package run: |