Merge pull request #22 from zopefoundation/config-with-zope-product-t…

…emplate-04db525f

Drop support for Python 2.7, 3.5, 3.6

.github/workflows/tests.yml

@@ -21,9 +21,6 @@ jobs:
         config:
         # [Python version, tox env]
         - ["3.9",   "lint"]
-        - ["2.7",   "py27"]
-        - ["3.5",   "py35"]
-        - ["3.6",   "py36"]
         - ["3.7",   "py37"]
         - ["3.8",   "py38"]
         - ["3.9",   "py39"]
@@ -57,7 +54,7 @@ jobs:
     - name: Coverage
       if: matrix.config[1] == 'coverage'
       run: |
-        pip install coveralls coverage-python-version
+        pip install coveralls
         coveralls --service=github
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.meta.toml

@@ -2,11 +2,10 @@
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [meta]
 template = "zope-product"
-commit-id = "d6240444ec6c9e203f2fd9f62c3e6038f9189e96"
+commit-id = "e5c611fb"
 
 [python]
 with-pypy = false
-with-legacy-python = true
 with-sphinx-doctests = false
 with-windows = false
 with-future-python = false
@@ -24,7 +23,6 @@ fail-under = 97
 
 [manifest]
 additional-rules = [
-    "include buildout4.cfg",
     "recursive-include src *.gif",
     "recursive-include src *.pt",
     "recursive-include src *.xml",

CHANGES.rst

@@ -1,9 +1,11 @@
 Products.CMFUid Changelog
 =========================
 
-3.6 (unreleased)
+4.0 (unreleased)
 ----------------
 
+- Drop support for Python 2.7, 3.5, 3.6.
+
 
 3.5 (2022-12-16)
 ----------------

MANIFEST.in

@@ -7,7 +7,6 @@ include buildout.cfg
 include tox.ini
 
 recursive-include src *.py
-include buildout4.cfg
 recursive-include src *.gif
 recursive-include src *.pt
 recursive-include src *.xml

setup.cfg

@@ -1,7 +1,7 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [bdist_wheel]
-universal = 1
+universal = 0
 
 [flake8]
 doctests = 1
@@ -17,7 +17,7 @@ ignore =
 force_single_line = True
 combine_as_imports = True
 sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
-known_third_party = six, docutils, pkg_resources
+known_third_party = six, docutils, pkg_resources, pytz
 known_zope = OFS, Products
 known_first_party = Products.CMFCore
 default_section = ZOPE

setup.py

@@ -19,21 +19,16 @@ def _read(name):
 
 setup(
     name='Products.%s' % NAME,
-    version='3.6.dev0',
+    version='4.0.dev0',
     description='Uid product for the Zope Content Management Framework',
     long_description=README,
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Framework :: Plone',
-        'Framework :: Zope :: 4',
         'Framework :: Zope :: 5',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Zope Public License',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
@@ -44,7 +39,7 @@ def _read(name):
     ],
     keywords='web application server zope cmf',
     author='Zope Foundation and Contributors',
-    author_email='zope-cmf@zope.org',
+    author_email='zope-dev@zope.dev',
     url='https://github.com/zopefoundation/Products.CMFUid',
     license='ZPL 2.1',
     packages=find_packages('src'),
@@ -65,6 +60,6 @@ def _read(name):
     },
     entry_points="""
     [zope2.initialize]
-    Products.%s = Products.%s:initialize
-    """ % (NAME, NAME),
+    Products.{} = Products.{}:initialize
+    """.format(NAME, NAME),
 )

src/Products/CMFUid/tests/test_uidannotation.py

@@ -283,5 +283,6 @@ def test_simulateNestedFolderCloneRemovingUid1(self):
 
 def test_suite():
     return unittest.TestSuite((
-        unittest.makeSuite(UniqueIdAnnotationToolTests),
+        unittest.defaultTestLoader.loadTestsFromTestCase(
+            UniqueIdAnnotationToolTests),
         ))

src/Products/CMFUid/tests/test_uidgeneration.py

@@ -65,5 +65,6 @@ def test_migrationFromBTreeLengthToInteger(self):
 
 def test_suite():
     return unittest.TestSuite((
-        unittest.makeSuite(UniqueIdGeneratorToolTests),
+        unittest.defaultTestLoader.loadTestsFromTestCase(
+            UniqueIdGeneratorToolTests),
         ))

src/Products/CMFUid/tests/test_uidhandling.py

@@ -44,7 +44,7 @@ class DummyContent(DummyContent):
     Think File and Image.
     """
     def __str__(self):
-        return u'M\xe4dchen'
+        return 'M\xe4dchen'
 
 
 class UniqueIdHandlerTests(SecurityTest):

src/Products/__init__.py

@@ -1,6 +1 @@
-# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)
+__import__('pkg_resources').declare_namespace(__name__)

tox.ini

@@ -4,9 +4,6 @@
 minversion = 3.18
 envlist =
     lint
-    py27
-    py35
-    py36
     py37
     py38
     py39
@@ -20,8 +17,7 @@ deps =
     zc.buildout >= 3.0.1
     wheel > 0.37
 commands_pre =
-    py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout4.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
-    !py27-!py35: {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
+    {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
 commands =
     {envdir}/bin/test {posargs:-cv}
 
@@ -33,7 +29,6 @@ allowlist_externals =
     mkdir
 commands =
     isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py
-    - flake8 {toxinidir}/src {toxinidir}/setup.py
     flake8 {toxinidir}/src {toxinidir}/setup.py
     check-manifest
     check-python-versions
@@ -63,7 +58,6 @@ allowlist_externals =
 deps =
     {[testenv]deps}
     coverage
-    coverage-python-version
 commands =
     mkdir -p {toxinidir}/parts/htmlcov
     coverage run {envdir}/bin/test {posargs:-cv}
@@ -72,7 +66,6 @@ commands =
 
 [coverage:run]
 branch = True
-plugins = coverage_python_version
 source = Products.CMFUid
 
 [coverage:report]