Drop support for Python 3.7. (#16)

Author: icemac

.github/workflows/tests.yml

@@ -17,28 +17,29 @@ jobs:
       fail-fast: false
       matrix:
         os:
-        - ["ubuntu", "ubuntu-20.04"]
+        - ["ubuntu", "ubuntu-latest"]
         config:
         # [Python version, tox env]
-        - ["3.9",   "lint"]
-        - ["3.7",   "py37"]
+        - ["3.11",  "release-check"]
+        - ["3.11",  "lint"]
         - ["3.8",   "py38"]
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
         - ["3.11",  "py311"]
-        - ["3.9",   "coverage"]
+        - ["3.12",  "py312"]
+        - ["3.11",   "coverage"]
 
     runs-on: ${{ matrix.os[1] }}
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: ${{ matrix.config[1] }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.config[0] }}
     - name: Pip cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
@@ -50,7 +51,11 @@ jobs:
         python -m pip install --upgrade pip
         pip install tox
     - name: Test
+      if: ${{ !startsWith(runner.os, 'Mac') }}
       run: tox -e ${{ matrix.config[1] }}
+    - name: Test (macOS)
+      if: ${{ startsWith(runner.os, 'Mac') }}
+      run: tox -e ${{ matrix.config[1] }}-universal2
     - name: Coverage
       if: matrix.config[1] == 'coverage'
       run: |

.meta.toml

@@ -2,14 +2,15 @@
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [meta]
 template = "zope-product"
-commit-id = "e5c611fb"
+commit-id = "b1221c3c"
 
 [python]
 with-pypy = false
 with-sphinx-doctests = false
 with-windows = false
 with-future-python = false
 with-macos = false
+with-docs = false
 
 [tox]
 use-flake8 = true

CHANGES.rst

@@ -1,9 +1,13 @@
 Changelog
 =========
 
-3.1 (unreleased)
+4.0 (unreleased)
 ----------------
 
+* Add support for Python 3.12.
+
+* Drop support for Python 3.7.
+
 
 3.0 (2023-02-01)
 ----------------

setup.cfg

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

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='five.formlib',
-    version='3.1.dev0',
+    version='4.0.dev0',
     url='https://github.com/zopefoundation/five.formlib',
     license='ZPL 2.1',
     description='zope.formlib integration for Zope.',
@@ -19,11 +19,11 @@
         "License :: OSI Approved :: Zope Public License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
@@ -34,7 +34,7 @@
     package_dir={'': 'src'},
     namespace_packages=['five'],
     include_package_data=True,
-    python_requires='>=3.7',
+    python_requires='>=3.8',
     install_requires=[
         'setuptools',
         'transaction',

src/five/formlib/tests/forms.txt

@@ -47,7 +47,7 @@ An unprotected form can be accessed with anonymously:
 
 We don't have access, we will not be able to get to the protected add form:
 
-  >>> browser.open("http://localhost/test_folder_1_/ftf/+/protectedaddform.html") 
+  >>> browser.open("http://localhost/test_folder_1_/ftf/+/protectedaddform.html")
   >>> print(browser.headers)
   Status: 401 ...
   ...
@@ -83,7 +83,7 @@ specified attribute is the default value:
   >>> edittest = self.folder.ftf.edittest
   >>> str(edittest.title)
   'title'
-  >>> edittest.description #XXX shouldn't we get a u'' here???
+  >>> edittest.description #XXX shouldn't we get a '' here???
 
 We can also verify that the IObjectCreatedEvent was fired, and the test
 subscriber we registered set a flag indicating such:
@@ -124,7 +124,7 @@ We will see that nothing has changed:
 
   >>> str(edittest.title)
   'title'
-  >>> edittest.description #XXX shouldn't we get a u'' here???
+  >>> edittest.description #XXX shouldn't we get a '' here???
   >>> getattr(edittest, '_modified_flag', False)
   False
 
@@ -198,12 +198,12 @@ the content, this means that no IObjectModified event should have been fired
 Unicode-safety of forms
 -----------------------
 
-Automatically generated forms support unicode (native strings
-under Python 3). Here we will enter the following two
-chinese sequences (How do you do? and I'm doing good) in forms:
+Automatically generated forms support native strings (formerly known as
+``unicode``). Here we will enter the following two chinese sequences ("How do
+you do?" and "I'm doing good.") in forms:
 
-  >>> ni_hao = u'\u4f60\u597d'
-  >>> wo_hen_hao = u'\u6211\u5f88\u597d'
+  >>> ni_hao = '\u4f60\u597d'
+  >>> wo_hen_hao = '\u6211\u5f88\u597d'
 
 First, it's imaginable that we make a mistake and enter one of the
 phrases in the integer field:
@@ -316,7 +316,7 @@ element to the list:
 
 Now, let's enter some more Chinese:
 
-  >>> de_guo = u'\u5fb7\u56fd'
+  >>> de_guo = '\u5fb7\u56fd'
 
   >>> print(http_request(
   ...     "/test_folder_1_/ftf/unicodetest/@@edit.html", (

tox.ini

@@ -3,23 +3,45 @@
 [tox]
 minversion = 3.18
 envlist =
+    release-check
     lint
-    py37
     py38
     py39
     py310
     py311
+    py312
     coverage
 
 [testenv]
 skip_install = true
 deps =
+    setuptools < 69
     zc.buildout >= 3.0.1
     wheel > 0.37
+setenv =
+    py312: VIRTUALENV_PIP=23.1.2
+    py312: PIP_REQUIRE_VIRTUALENV=0
 commands_pre =
     {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
 commands =
-    {envdir}/bin/test {posargs:-cv}
+    {envbindir}/test {posargs:-cv}
+
+[testenv:release-check]
+description = ensure that the distribution is ready to release
+basepython = python3
+skip_install = true
+deps =
+    twine
+    build
+    check-manifest
+    check-python-versions >= 0.20.0
+    wheel
+commands_pre =
+commands =
+    check-manifest
+    check-python-versions --only setup.py,tox.ini,.github/workflows/tests.yml
+    python -m build --sdist --no-isolation
+    twine check dist/*
 
 [testenv:lint]
 basepython = python3
@@ -30,11 +52,7 @@ allowlist_externals =
 commands =
     isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py
     flake8 {toxinidir}/src {toxinidir}/setup.py
-    check-manifest
-    check-python-versions
 deps =
-    check-manifest
-    check-python-versions
     flake8
     isort
     # Useful flake8 plugins that are Python and Plone specific:
@@ -54,13 +72,14 @@ commands =
 basepython = python3
 skip_install = true
 allowlist_externals =
+    {[testenv]allowlist_externals}
     mkdir
 deps =
     {[testenv]deps}
     coverage
 commands =
     mkdir -p {toxinidir}/parts/htmlcov
-    coverage run {envdir}/bin/test {posargs:-cv}
+    coverage run {envbindir}/test {posargs:-cv}
     coverage html
     coverage report -m --fail-under=82
 
@@ -70,6 +89,7 @@ source = five.formlib
 
 [coverage:report]
 precision = 2
+ignore_errors = True
 exclude_lines =
     pragma: no cover
     pragma: nocover