From 8fbee5ad2662e71b03706462abcb2a663145d379 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Wed, 5 Jun 2024 09:13:21 +0200 Subject: [PATCH 1/5] Bumped version for breaking release. --- CHANGES.rst | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index e5d2c6a..4265df3 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,7 +1,7 @@ Changelog ========= -4.7 (unreleased) +5.0 (unreleased) ---------------- - Nothing changed yet. diff --git a/setup.py b/setup.py index 517ae4b..ca1954f 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ with open('CHANGES.rst') as f: CHANGES = f.read() -version = '4.7.dev0' +version = '5.0.dev0' setup(name='DocumentTemplate', From 2c2f7ffc864df94448fbbdb44b6f2196286563ef Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Wed, 5 Jun 2024 09:13:22 +0200 Subject: [PATCH 2/5] Drop support for Python 3.7. --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 4265df3..b0ed6f9 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,7 @@ Changelog 5.0 (unreleased) ---------------- -- Nothing changed yet. +- Drop support for Python 3.7. 4.6 (2023-11-13) From c514525775cf6b8e8a275c373d0d984fdfaaf658 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Wed, 5 Jun 2024 09:15:41 +0200 Subject: [PATCH 3/5] Configuring for zope-product --- .github/workflows/tests.yml | 19 +++++++++++-------- .meta.toml | 3 ++- setup.cfg | 2 -- tox.ini | 10 +++++----- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f4946db..2e30321 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,30 +17,29 @@ jobs: fail-fast: false matrix: os: - - ["ubuntu", "ubuntu-20.04"] + - ["ubuntu", "ubuntu-latest"] config: # [Python version, tox env] - - ["3.9", "release-check"] - - ["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.12", "py312"] - - ["3.9", "coverage"] + - ["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') }} @@ -52,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: | diff --git a/.meta.toml b/.meta.toml index fc24c97..033bf51 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/zope-product [meta] template = "zope-product" -commit-id = "6f8d8c51" +commit-id = "5cfe894f" [python] with-pypy = false @@ -10,6 +10,7 @@ with-sphinx-doctests = false with-windows = false with-future-python = false with-macos = false +with-docs = false [tox] use-flake8 = true diff --git a/setup.cfg b/setup.cfg index ecf5211..3a7e141 100644 --- a/setup.cfg +++ b/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 diff --git a/tox.ini b/tox.ini index 6bef684..c228a8b 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,6 @@ minversion = 3.18 envlist = release-check lint - py37 py38 py39 py310 @@ -16,6 +15,7 @@ envlist = [testenv] skip_install = true deps = + setuptools < 69 zc.buildout >= 3.0.1 wheel > 0.37 setenv = @@ -24,8 +24,7 @@ setenv = 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 @@ -39,7 +38,7 @@ deps = commands_pre = commands = check-manifest - check-python-versions + check-python-versions --only setup.py,tox.ini,.github/workflows/tests.yml python -m build --sdist --no-isolation twine check dist/* @@ -79,7 +78,7 @@ 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=74 @@ -89,6 +88,7 @@ source = DocumentTemplate [coverage:report] precision = 2 +ignore_errors = True exclude_lines = pragma: no cover pragma: nocover From fcedb47302ad9e53540f8d35f875ef26894df066 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Wed, 5 Jun 2024 09:16:40 +0200 Subject: [PATCH 4/5] Drop support for Python 3.7. --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index ca1954f..cdabdf2 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,6 @@ "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", @@ -61,7 +60,7 @@ "Topic :: Text Processing :: Markup", ], keywords='DTML template zope HTML SQL web markup', - python_requires='>=3.7', + python_requires='>=3.8', install_requires=[ 'AccessControl >= 4.0a5', 'Acquisition', From 2e0f5735d8637f57e12dc1c9e12d4c7fe12bc2c4 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Thu, 6 Jun 2024 08:22:18 +0200 Subject: [PATCH 5/5] Configuring for zope-product --- .meta.toml | 2 +- tox.ini | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.meta.toml b/.meta.toml index 033bf51..dcb11b4 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/zope-product [meta] template = "zope-product" -commit-id = "5cfe894f" +commit-id = "b1221c3c" [python] with-pypy = false diff --git a/tox.ini b/tox.ini index c228a8b..714e9e4 100644 --- a/tox.ini +++ b/tox.ini @@ -25,6 +25,7 @@ commands_pre = {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test commands = {envbindir}/test {posargs:-cv} + [testenv:release-check] description = ensure that the distribution is ready to release basepython = python3