diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 61c32c67..30d98f3c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,19 +15,21 @@ jobs: - "3.9" - "3.10" - "3.11" + - "3.12" plone: - - "6.0-dev" + - "6.0-latest" 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.0.0 with: python-version: ${{ matrix.python }} plone-version: ${{ matrix.plone }} - + setuptools-version: 69.5.1 + additional-eggs: 'setuptools' - name: Install package run: | make install diff --git a/constraints.txt b/constraints.txt index c0e8f2f6..228b6cc7 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 diff --git a/docs/155.bugfix b/docs/155.bugfix new file mode 100644 index 00000000..f80359b8 --- /dev/null +++ b/docs/155.bugfix @@ -0,0 +1 @@ +Replace configparser.readfp with readfile for Python 3.12 compatibility [@fredvd] diff --git a/mx.ini b/mx.ini index 66279962..fd24c7b3 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 diff --git a/src/collective/taxonomy/exportimport.py b/src/collective/taxonomy/exportimport.py index e0b98a35..4e19312d 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