Added plone 6.1 gha

chris-adam · chris-adam · commit c0b91a0b714d · 2025-04-15T13:38:08.000+02:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -21,28 +21,23 @@ jobs:
             plone: 5.2
           - python: 3.10.11
             plone: "6.0"
+          - python: 3.12.7
+            plone: "6.1"
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up pyenv and Python
-        uses: "gabrielfalcao/pyenv-action@v14"
+        uses: "gabrielfalcao/pyenv-action@v18"
         with:
           default: "${{ matrix.python }}"
       - name: Setup Env
         run: |
           sudo apt-get update -qqy
-          sudo apt-get install -qqy g++ libpng-dev cmake libqt5widgets5 qttools5-dev
-          wget -t 3 -T 60 --waitretry 5 -O zint-2.8.0.tar.gz https://sourceforge.net/projects/zint/files/zint/2.8.0/zint-2.8.0.tar.gz/download
-          tar -xf zint-2.8.0.tar.gz
-          cd zint-2.8.0
-          sudo cmake .
-          sudo make
-          sudo make install
-          cd ..
+          sudo apt-get install -qqy g++ libpng-dev cmake libqt5widgets5 qttools5-dev zint
           pip install --upgrade pip
           pip install -r requirements-${{ matrix.plone }}.txt
       - name: Cache eggs
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-eggs
         with:
@@ -70,7 +65,7 @@ jobs:
         run: |
           bin/test -t !robot
   coverage:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -79,29 +74,20 @@ jobs:
             plone: "4.3"
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up pyenv and Python
-        uses: "gabrielfalcao/pyenv-action@v14"
+        uses: "gabrielfalcao/pyenv-action@v18"
         with:
           default: "${{ matrix.python }}"
       - name: Setup Env
         run: |
           sudo apt-get update -qqy
-          sudo apt-get install -qqy g++ libpng-dev cmake libqt5widgets5 qttools5-dev
-          wget -t 3 -T 60 --waitretry 5 -O zint-2.8.0.tar.gz https://sourceforge.net/projects/zint/files/zint/2.8.0/zint-2.8.0.tar.gz/download
-          tar -xf zint-2.8.0.tar.gz
-          cd zint-2.8.0
-          sudo cmake .
-          sudo make
-          sudo make install
-          cd ..
+          sudo apt-get install -qqy g++ libpng-dev cmake libqt5widgets5 qttools5-dev zint
           pip install --upgrade pip
           pip install -r requirements-${{ matrix.plone }}.txt
-          pip install --upgrade pip
-          pip install -r requirements-${{matrix.plone}}.txt
           pip install -U coveralls coverage
       - name: Cache eggs
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-eggs
         with:
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@
 .settings/
 bin/
 buildout-cache/
+CACHEDIR.TAG
 checkversion*.html
 develop-eggs/
 htmlcov/
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -15,6 +15,8 @@ Changelog
 - Fixed `content.base_getattr` that was not returning the `default` if attribute
   not existing.
   [gbastien]
+- Added Plone 6.1 version in buildout.
+  [chris-adam]
 
 0.80 (2023-12-11)
 -----------------
diff --git a/Makefile b/Makefile
@@ -1,10 +1,10 @@
 #!/usr/bin/make
-# pyenv is a requirement, with 2.7, 3.7 and 3.10 python versions, and virtualenv installed in each version
+# pyenv is a requirement, with 2.7, 3.7, 3.10 and 3.12 python versions, and virtualenv installed in each version
 # plone parameter must be passed to create environment 'make setup plone=6.0' or after a make cleanall
 # The original Makefile can be found on https://github.com/IMIO/scripts-buildout
 
 SHELL=/bin/bash
-plones=4.3 5.2 6.0
+plones=4.3 5.2 6.0 6.1
 b_o=
 old_plone=$(shell [ -e .plone-version ] && cat .plone-version)
 
@@ -15,10 +15,13 @@ endif
 ifndef plone
 ifeq (,$(filter setup,$(MAKECMDGOALS)))
   plone=$(old_plone)
-  b_o=-N
 endif
 endif
 
+ifneq ($(wildcard bin/instance),)
+    b_o=-N
+endif
+
 ifndef python
 ifeq ($(plone),4.3)
   python=2.7
@@ -29,6 +32,9 @@ endif
 ifeq ($(plone),6.0)
   python=3.10
 endif
+ifeq ($(plone),6.1)
+  python=3.12
+endif
 endif
 
 all: buildout
diff --git a/requirements-6.1.txt b/requirements-6.1.txt
@@ -0,0 +1,3 @@
+-c https://dist.plone.org/release/6.1-latest/requirements.txt
+setuptools
+zc.buildout
diff --git a/setup.py b/setup.py
@@ -21,13 +21,15 @@
         "Framework :: Plone :: 4.3",
         "Framework :: Plone :: 5.2",
         "Framework :: Plone :: 6.0",
+        "Framework :: Plone :: 6.1",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.12",
     ],
     keywords='plone helpers utils dev imio',
     author='Simon Delcourt',
@@ -45,7 +47,7 @@
         'collective.monkeypatcher',
         'future>=0.18.2',
         'imio.pyutils>=1.0.0a0',
-        'natsort<7',
+        'natsort',
         "pathlib2;python_version<'3'",
         'plone.api>1.9.1',
         'plone.app.intid',
diff --git a/src/imio/helpers/tests/test_appy_pod.py b/src/imio/helpers/tests/test_appy_pod.py
@@ -19,10 +19,10 @@ def test_load_appy_pod_sample_archetypes(self):
         # does not break if called on an unexisting field or
         # not RichText field, just do nothing and display a portal_message
         view(field_name='title')
-        self.assertEquals(doc.Title(), 'Original title')
+        self.assertEqual(doc.Title(), 'Original title')
         view(field_name='unexisting_field_name')
         # call it on a real RichText field_name
-        self.assertEquals(doc.getText(), '')
+        self.assertEqual(doc.getText(), '')
         view(field_name='text')
         self.assertNotEquals(doc.getText(), '')
 
@@ -36,9 +36,9 @@ def test_load_appy_pod_sample_dexterity(self):
         # does not break if called on an unexisting field or
         # not RichText field, just do nothing and display a portal_message
         view(field_name='title')
-        self.assertEquals(doc.Title(), 'Original title')
+        self.assertEqual(doc.Title(), 'Original title')
         view(field_name='unexisting_field_name')
         # call it on a real RichText field_name
-        self.assertEquals(doc.text, None)
+        self.assertEqual(doc.text, None)
         view(field_name='text')
         self.assertTrue(isinstance(doc.text, RichTextValue))
diff --git a/src/imio/helpers/tests/test_barcode.py b/src/imio/helpers/tests/test_barcode.py
@@ -3,14 +3,18 @@
 from imio.helpers import barcode
 
 import os
+import six
 import unittest
 
 
 class TestBarcode(unittest.TestCase):
 
     def test_generate_barcode(self):
         current_dir = os.path.dirname(os.path.abspath(__file__))
-        barcode_resource = "barcode_python2_zint_60x60_278bytes.png"
+        if six.PY3:
+            barcode_resource = "barcode_python3_zint_60x60_156bytes.png"
+        else:
+            barcode_resource = "barcode_python2_zint_60x60_278bytes.png"
         with open(os.path.join(current_dir, barcode_resource), 'rb') as barcode_file:
             bc = barcode_file.read()
             result = barcode.generate_barcode('123')
diff --git a/src/imio/helpers/tests/test_cache.py b/src/imio/helpers/tests/test_cache.py
@@ -93,69 +93,69 @@ def test_cleanVocabularyCacheFor(self):
         # once get, it is cached
         vocab(self.portal)
         self.assertTrue(getattr(vocab, memPropName))
-        self.assertEquals([term.token for term in vocab(self.portal)._terms],
+        self.assertEqual([term.token for term in vocab(self.portal)._terms],
                           ['1', '2'])
 
         # change value but do not clean cache
         self.request.set('vocab_values', ('1', '2', '3'))
-        self.assertEquals([term.token for term in vocab(self.portal)._terms],
+        self.assertEqual([term.token for term in vocab(self.portal)._terms],
                           ['1', '2'])
         # clean vocabulary cache
         cleanVocabularyCacheFor("imio.helpers.testing.testingvocabulary")
-        self.assertEquals([term.token for term in vocab(self.portal)._terms],
+        self.assertEqual([term.token for term in vocab(self.portal)._terms],
                           ['1', '2', '3'])
 
         # every existing vocabularies can also be cleaned if nothing passed to cleanVocabularyCacheFor
         self.request.set('vocab_values', ('1', '2', '3', '4'))
-        self.assertEquals([term.token for term in vocab(self.portal)._terms],
+        self.assertEqual([term.token for term in vocab(self.portal)._terms],
                           ['1', '2', '3'])
         # clean vocabulary cache
         cleanVocabularyCacheFor("imio.helpers.testing.testingvocabulary")
-        self.assertEquals([term.token for term in vocab(self.portal)._terms],
+        self.assertEqual([term.token for term in vocab(self.portal)._terms],
                           ['1', '2', '3', '4'])
 
         # if cleanVocabularyCacheFor is called without parameter,
         # every registered vocabularies cache is cleaned
         self.request.set('vocab_values', ('1', '2', '3', '4', '5'))
-        self.assertEquals([term.token for term in vocab(self.portal)._terms],
+        self.assertEqual([term.token for term in vocab(self.portal)._terms],
                           ['1', '2', '3', '4'])
         cleanVocabularyCacheFor()
-        self.assertEquals([term.token for term in vocab(self.portal)._terms],
+        self.assertEqual([term.token for term in vocab(self.portal)._terms],
                           ['1', '2', '3', '4', '5'])
 
     def test_cleanRamCache(self):
         """
         This helper method invalidates all ram.cache.
         """
         self.request.set('ramcached', 'a')
-        self.assertEquals(ramCachedMethod(self.portal, param='1'), 'a')
+        self.assertEqual(ramCachedMethod(self.portal, param='1'), 'a')
         # change value in REQUEST, as it is ram cached, it will still return 'a'
         self.request.set('ramcached', 'b')
-        self.assertEquals(ramCachedMethod(self.portal, param='1'), 'a')
+        self.assertEqual(ramCachedMethod(self.portal, param='1'), 'a')
         # ram.cache works as expected if param changes
-        self.assertEquals(ramCachedMethod(self.portal, param='2'), 'b')
+        self.assertEqual(ramCachedMethod(self.portal, param='2'), 'b')
         # try again
-        self.assertEquals(ramCachedMethod(self.portal, param='1'), 'a')
+        self.assertEqual(ramCachedMethod(self.portal, param='1'), 'a')
         # now clean all caches, it will returns 'b'
         cleanRamCache()
-        self.assertEquals(ramCachedMethod(self.portal, param='1'), 'b')
+        self.assertEqual(ramCachedMethod(self.portal, param='1'), 'b')
 
     def test_cleanRamCacheFor(self):
         """
         This helper method invalidates ram.cache for given method.
         """
         self.request.set('ramcached', 'a')
-        self.assertEquals(ramCachedMethod(self.portal, param='1'), 'a')
+        self.assertEqual(ramCachedMethod(self.portal, param='1'), 'a')
         # change value in REQUEST, as it is ram cached, it will still return 'a'
         self.request.set('ramcached', 'b')
-        self.assertEquals(ramCachedMethod(self.portal, param='1'), 'a')
+        self.assertEqual(ramCachedMethod(self.portal, param='1'), 'a')
         # ram.cache works as expected if param changes
-        self.assertEquals(ramCachedMethod(self.portal, param='2'), 'b')
+        self.assertEqual(ramCachedMethod(self.portal, param='2'), 'b')
         # try again
-        self.assertEquals(ramCachedMethod(self.portal, param='1'), 'a')
+        self.assertEqual(ramCachedMethod(self.portal, param='1'), 'a')
         # now clean cache, it will returns 'b'
         cleanRamCacheFor('imio.helpers.tests.test_cache.ramCachedMethod')
-        self.assertEquals(ramCachedMethod(self.portal, param='1'), 'b')
+        self.assertEqual(ramCachedMethod(self.portal, param='1'), 'b')
 
     def test_cleanForeverCache(self):
         """Test the cache.cleanForeverCache function."""
@@ -179,7 +179,7 @@ def test_get_cachekey_volatile(self):
         volatiles = getattr(self.portal, VOLATILE_ATTR, {})
         self.assertTrue(isinstance(volatiles.get(volatile_name), datetime))
         # calling it again will still return same date
-        self.assertEquals(date, get_cachekey_volatile(method_name))
+        self.assertEqual(date, get_cachekey_volatile(method_name))
         # volatiles are not removed by tearDown, remove it now to avoid
         # test isolation issues with test test_invalidate_cachekey_volatile_for
         invalidate_cachekey_volatile_for(method_name)
diff --git a/src/imio/helpers/tests/test_content.py b/src/imio/helpers/tests/test_content.py
@@ -178,7 +178,7 @@ def test_create(self):
         ret = create(conf, cids={10: self.portal.folder}, pos=True)
         self.assertIn(4, ret)
         self.assertIn('doc2', self.portal.folder.objectIds())
-        self.assertEquals(self.portal.folder.getObjectPosition('doc2'), 0)
+        self.assertEqual(self.portal.folder.getObjectPosition('doc2'), 0)
 
     def test_get_schema_fields(self):
         """ """
diff --git a/src/imio/helpers/tests/test_setup.py b/src/imio/helpers/tests/test_setup.py
@@ -5,6 +5,7 @@
 from imio.helpers.setup import remove_gs_step
 from imio.helpers.testing import IntegrationTestCase
 from plone import api
+from Products.CMFPlone.utils import get_installer
 
 import unittest
 
@@ -18,13 +19,16 @@ def setUp(self):
         self.portal = self.layer['portal']
 
     def test_load_type_from_package(self):
+        installer = get_installer(self.portal)
+        installer.install_product("plone.app.discussion")
+
         types_tool = api.portal.get_tool('portal_types')
         portal_type = types_tool.get('Discussion Item')
         self.assertTrue(portal_type.filter_content_types)
         portal_type.filter_content_types = False
         self.assertFalse(portal_type.filter_content_types)
         self.assertTrue(load_type_from_package(
-            'Discussion Item', 'profile-Products.CMFPlone:plone'))
+            'Discussion Item', 'plone.app.discussion:default'))
         portal_type = types_tool.get('Discussion Item')
         self.assertTrue(portal_type.filter_content_types)
         # not found portal_type
diff --git a/src/imio/helpers/tests/test_transmogrifier.py b/src/imio/helpers/tests/test_transmogrifier.py
diff --git a/test-6.1.cfg b/test-6.1.cfg

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-c https://dist.plone.org/release/6.1-latest/requirements.txt`
	`2`	`+setuptools`
	`3`	`+zc.buildout`