Switch to pyproject.toml based project setup

Author: Daverball

.github/workflows/main.yml

@@ -19,30 +19,25 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "pypy3"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "pypy3.11"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: "actions/checkout@v2"
-      - uses: "actions/setup-python@v2"
+      - uses: "actions/checkout@v6"
+      - uses: "actions/setup-python@v6"
         with:
           python-version: "${{ matrix.python-version }}"
       - name: "Install dependencies"
-        run: |
-          set -xe
-          python -VV
-          python -m site
-          python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade virtualenv tox tox-gh-actions          
+        run: python -m pip install --upgrade pip tox tox-gh
       - name: "Run tox targets for ${{ matrix.python-version }}"
         run: "python -m tox"
 
       - name: "Report to coveralls"
-        # coverage is only created in the py39 environment
+        # coverage is only created in the py314 environment
         # --service=github is a workaround for bug
         # https://github.com/coveralls-clients/coveralls-python/issues/251
-        if: "matrix.python-version == '3.9'"
+        if: "matrix.python-version == '3.14'"
         run: |
           pip install coveralls
           coveralls --service=github

.pre-commit-config.yaml

@@ -1,14 +1,15 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 26.5.1
     hooks:
       - id: black
   - repo: https://github.com/PyCQA/flake8
-    rev: "3.8.4"
+    rev: "7.3.0"
     hooks:
       - id: flake8
+        additional_dependencies: [flake8-pyproject]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.7.4
+    rev: v3.21.2
     hooks:
     - id: pyupgrade
-      args: [--py36-plus]
+      args: [--py310-plus]

CHANGES.txt

@@ -8,9 +8,9 @@ CHANGES
 
 - Apply Black code formatter.
 
-- Drop support for Python 3.4 and 3.5.
+- Add support for Python 3.10, 3.11, 3.12, 3.13 and 3.14
 
-- Add support for Python 3.9.
+- Drop support for Python 3.9 and below
 
 - Use GitHub Actions instead of Travis for CI.
 (Travis no longer gives free credits to open source projects.)

README.rst

@@ -13,7 +13,7 @@
 
 
 Dectate: a configuration engine for Python frameworks
-=======================================================
+*****************************************************
 
 Dectate is a powerful configuration engine for Python frameworks.
 

dectate/config.py

@@ -11,7 +11,6 @@
 from .toposort import topological_sort
 from .sentinel import NOT_FOUND
 
-
 order_count = 0
 
 

dectate/sphinxext.py

@@ -4,6 +4,7 @@
 object using the directive decorator, and the signature needs to be
 obtained from the action class's ``__init__`` manually.
 """
+
 import inspect
 
 

develop_requirements.txt

@@ -1,7 +1,7 @@
 # development
--e '.[test,coverage,pep8,docs]'
+-e '.[test,coverage,lint,docs]'
 pre-commit
-tox >= 2.4.1
+tox >= 4
 radon
 
 # releaser

doc/developing.rst

@@ -165,8 +165,8 @@ You can run all tox tests with::
 
 You can also specify a test environment to run e.g.::
 
-  $ tox -e py37
-  $ tox -e pep8
+  $ tox -e py311
+  $ tox -e lint
   $ tox -e docs
 
 .. _pyenv: https://github.com/yyuu/pyenv

pyproject.toml

@@ -1,6 +1,70 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "dectate"
+version = "0.15.dev0"
+dynamic = ["readme"]
+description = "A configuration engine for Python frameworks"
+license = "BSD-3-Clause"
+license-files = ["LICENSE.txt"]
+authors = [{name = "Martijn Faassen", email = "faassen@startifact.com"}]
+maintainers = [{name = "Henri Hulski", email = "henri@sancode.it"}]
+keywords = ["configuration"]
+classifiers = [
+    "Intended Audience :: Developers",
+    "Topic :: Software Development :: Libraries :: Application Frameworks",
+    "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 :: 3 :: Only",
+    "Programming Language :: Python :: Implementation :: PyPy",
+    "Development Status :: 5 - Production/Stable",
+]
+requires-python = ">= 3.10"
+
+[project.urls]
+Documentation = "https://dectate.readthedocs.io"
+Repository = "https://github.com/morepath/dectate"
+Issues = "https://github.com/morepath/dectate/issues"
+Changelog = "https://github.com/morepath/dectate/blob/master/CHANGES.txt"
+
+[project.optional-dependencies]
+test = ["pytest >= 8", "pytest-env"]
+coverage = ["pytest-cov"]
+lint = ["black", "flake8", "flake8-pyproject"]
+docs = ["sphinx"]
+
+[tool.setuptools.packages]
+find = {}
+
+[tool.setuptools.dynamic]
+readme = {file = ["README.rst", "CHANGES.txt"]}
+
+[tool.pytest.ini_options]
+minversion = "8.0"
+testpaths = ["dectate"]
+addopts = ["-vv"]
+env = ["RUN_ENV=test"]
+
+[tool.coverage.run]
+omit = ["dectate/tests/*"]
+source = ["dectate"]
+
+[tool.coverage.report]
+show_missing = true
+
+[tool.flake8]
+show-source = true
+ignore = ["E203", "W503"]
+max-line-length = 80
+
 [tool.black]
 line-length = 80
-target-version = ['py34', 'py35', 'py36', 'py37', 'py38']
+target-version = ['py310', 'py311', 'py312', 'py313', 'py314']
 include = '\.pyi?$'
 exclude = '''
 (
@@ -13,3 +77,53 @@ exclude = '''
   )/
 )
 '''
+
+[tool.tox]
+requires = ["tox>=4"]
+env_list = [
+    "py310",
+    "py311",
+    "py312",
+    "py313",
+    "py314",
+    "pypy3",
+    "coverage",
+    "pre-commit",
+    "docs",
+]
+skip_missing_interpreters = true
+
+[tool.tox.gh.python]
+"3.10" = ["py310"]
+"3.11" = ["py311"]
+"3.12" = ["py312"]
+"3.13" = ["py313"]
+"3.14" = ["py314", "pre-commit", "coverage"]
+"pypy-3.11" = ["pypy3"]
+
+[tool.tox.env_run_base]
+package = "editable"
+extras = ["test"]
+commands = [["pytest", "{posargs:dectate}"]]
+
+[tool.tox.env.coverage]
+base_python = ["python3"]
+extras = ["test", "coverage"]
+commands = [
+    ["pytest", "--cov", "--cov-fail-under=94", "{posargs:dectate}"],
+]
+
+[tool.tox.env.pre-commit]
+base_python = ["python3"]
+package = "skip"
+deps = ["pre-commit"]
+commands = [
+    ["pre-commit", "run", "--all-files"],
+]
+
+[tool.tox.env.docs]
+base_python = ["python3"]
+extras = ["docs"]
+commands = [
+    ["sphinx-build", "-b", "doctest", "doc", "{env_tmp_dir}"],
+]