diff --git a/.editorconfig b/.editorconfig index c5508b9..e4b8673 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,8 +1,8 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python # # EditorConfig Configuration file, for more details see: -# http://EditorConfig.org +# https://EditorConfig.org # EditorConfig is a convention description, that could be interpreted # by multiple editors to enforce common coding conventions for specific # file types @@ -12,7 +12,7 @@ root = true -[*] # For All Files +[*] # Unix-style newlines with a newline ending every file end_of_line = lf insert_final_newline = true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index ff77ae6..8a1cde6 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python name: pre-commit on: @@ -21,10 +21,10 @@ jobs: name: linting runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - uses: actions/checkout@v6 + - uses: actions/setup-python@v6 with: - python-version: 3.x + python-version: '3.13' - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd #v3.0.1 with: extra_args: --all-files --show-diff-on-failure diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0d61152..2d17fd0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python name: tests on: @@ -24,36 +24,33 @@ jobs: config: # [Python version, tox env] - ["3.11", "release-check"] - - ["3.9", "py39"] - ["3.10", "py310"] - ["3.11", "py311"] - ["3.12", "py312"] - ["3.13", "py313"] - - ["pypy-3.10", "pypy3"] + - ["3.14", "py314"] + - ["pypy-3.11", "pypy3"] - ["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@v4 + - uses: actions/checkout@v6 with: persist-credentials: false - name: Install uv + caching - uses: astral-sh/setup-uv@v5 + # astral/setup-uv@7.3.0 + uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b with: enable-cache: true cache-dependency-glob: | setup.* tox.ini - python-version: ${{ matrix.matrix.config[0] }} + python-version: ${{ matrix.config[0] }} github-token: ${{ secrets.GITHUB_TOKEN }} - name: Test - if: ${{ !startsWith(runner.os, 'Mac') }} run: uvx --with tox-uv tox -e ${{ matrix.config[1] }} - - name: Test (macOS) - if: ${{ startsWith(runner.os, 'Mac') }} - run: uvx --with tox-uv tox -e ${{ matrix.config[1] }}-universal2 - name: Coverage if: matrix.config[1] == 'coverage' run: | diff --git a/.gitignore b/.gitignore index 1f321f5..2596a59 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python *.dll *.egg-info/ *.profraw diff --git a/.meta.toml b/.meta.toml index 696a068..daba5bb 100644 --- a/.meta.toml +++ b/.meta.toml @@ -1,8 +1,8 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python [meta] template = "pure-python" -commit-id = "8518e7ed" +commit-id = "b1421b8b" [python] with-macos = false @@ -11,8 +11,10 @@ with-pypy = true with-future-python = false with-sphinx-doctests = false with-docs = false +with-free-threaded-python = false [tox] +testenv-skip-test-extra = true testenv-deps = [ "zope.testrunner", ] diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b201c4b..56fecdb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,9 +1,9 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python minimum_pre_commit_version: '3.6' repos: - repo: https://github.com/pycqa/isort - rev: "6.0.1" + rev: "7.0.0" hooks: - id: isort - repo: https://github.com/hhatto/autopep8 @@ -12,16 +12,16 @@ repos: - id: autopep8 args: [--in-place, --aggressive, --aggressive] - repo: https://github.com/asottile/pyupgrade - rev: v3.19.1 + rev: v3.21.2 hooks: - id: pyupgrade - args: [--py39-plus] + args: [--py310-plus] - repo: https://github.com/isidentical/teyit rev: 0.4.3 hooks: - id: teyit - repo: https://github.com/PyCQA/flake8 - rev: "7.2.0" + rev: "7.3.0" hooks: - id: flake8 additional_dependencies: diff --git a/CHANGES.rst b/CHANGES.rst index 2d7b24d..ca250af 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,8 @@ Changelog 6.1 (unreleased) ---------------- +- Move package metadata from setup.py to pyproject.toml. + - Add support for Python 3.12, 3.13. - Drop support for Python 3.7, 3.8. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0ab12fe..ca517f4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing to zopefoundation projects diff --git a/MANIFEST.in b/MANIFEST.in index a2c9df9..e5a05b0 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python include *.md include *.rst include *.txt diff --git a/pyproject.toml b/pyproject.toml index d9b1c84..a586221 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,13 +1,49 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python - +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python [build-system] requires = [ - "setuptools == 75.8.2", + "setuptools >= 78.1.1,< 81", "wheel", ] build-backend = "setuptools.build_meta" + +[project] +name = "ZopeUndo" +version = "6.1.dev0" +description = "ZODB undo support for Zope." +license = "ZPL-2.1" +classifiers = [ + "Development Status :: 6 - Mature", + "Environment :: Web Environment", + "Framework :: Zope :: 5", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", + "Programming Language :: Python :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: PyPy", +] +dynamic = ["readme"] +requires-python = ">=3.10" +authors = [ + {name = "Zope Foundation and contributors",email = "zope-dev@zope.dev"}, +] +maintainers = [ + {name = "Plone Foundation and contributors",email = "zope-dev@zope.dev"}, +] +dependencies = [] +keywords = ["zope", "zope5", "undo"] + +[project.urls] +Source = "https://github.com/zopefoundation/ZopeUndo" +Issues = "https://github.com/zopefoundation/ZopeUndo/issues" +Changelog = "https://raw.githubusercontent.com/zopefoundation/ZopeUndo/master/CHANGES.rst" + [tool.coverage.run] branch = true source = ["ZopeUndo"] @@ -30,3 +66,7 @@ exclude_lines = [ [tool.coverage.html] directory = "parts/htmlcov" + +[tool.setuptools.dynamic] +readme = {file = ["README.rst", "CHANGES.rst"]} + diff --git a/setup.cfg b/setup.cfg index 064a6fe..7c88981 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python [flake8] doctests = 1 diff --git a/setup.py b/setup.py index e646212..ffaa89a 100644 --- a/setup.py +++ b/setup.py @@ -11,54 +11,8 @@ # FOR A PARTICULAR PURPOSE. # ############################################################################## - -import os - -from setuptools import find_packages from setuptools import setup -version = '6.1.dev0' - -here = os.path.abspath(os.path.dirname(__file__)) -with open(os.path.join(here, 'README.rst')) as f: - README = f.read() -with open(os.path.join(here, 'CHANGES.rst')) as f: - CHANGES = f.read() - - -setup( - name='ZopeUndo', - version=version, - url='http://pypi.python.org/pypi/ZopeUndo', - license='ZPL-2.1', - description="ZODB undo support for Zope.", - author='Zope Foundation and Contributors', - author_email='zope-dev@zope.dev', - long_description=README + '\n\n' + CHANGES, - packages=find_packages('src'), - package_dir={'': 'src'}, - classifiers=[ - "Development Status :: 6 - Mature", - "Environment :: Web Environment", - "Framework :: Zope :: 5", - "License :: OSI Approved :: Zope Public License", - "Operating System :: OS Independent", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: 3.13", - "Programming Language :: Python :: Implementation :: CPython", - "Programming Language :: Python :: Implementation :: PyPy", - ], - python_requires='>=3.9', - keywords="zope zope4 undo", - install_requires=[ - 'setuptools', - ], - include_package_data=True, - zip_safe=False, -) +# See pyproject.toml for package metadata +setup() diff --git a/tox.ini b/tox.ini index 126eb54..5578473 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,15 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python [tox] minversion = 3.18 envlist = release-check lint - py39 py310 py311 py312 py313 + py314 pypy3 coverage @@ -18,12 +18,11 @@ usedevelop = true package = wheel wheel_build_env = .pkg deps = - setuptools == 75.8.2 + setuptools >= 78.1.1,< 81 zope.testrunner commands = zope-testrunner --test-path=src {posargs:-vc} extras = - test [testenv:setuptools-latest] basepython = python3 @@ -36,7 +35,7 @@ description = ensure that the distribution is ready to release basepython = python3 skip_install = true deps = - setuptools == 75.8.2 + setuptools >= 78.1.1,< 81 wheel twine build @@ -46,7 +45,7 @@ deps = commands_pre = commands = check-manifest - check-python-versions --only setup.py,tox.ini,.github/workflows/tests.yml + check-python-versions --only pyproject.toml,setup.py,tox.ini,.github/workflows/tests.yml python -m build --sdist --no-isolation twine check dist/*