Switch to pyproject.toml based project setup and PEP-420

Author: Daverball

.bumpversion.cfg

@@ -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

.coveragerc

@@ -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]

.github/workflows/main.yml

@@ -5,10 +5,13 @@ unreleased
 ~~~~~~~~~~
 
 - Update supported Python versions.
-  [jugmac00]
+  [jugmac00] & [Daverball]
 
 - Use GitHub Actions for CI.
-  [jugmac00
+  [jugmac00]
+
+- Switch to PEP-420 namespace package
+  [Daverball]
 
 0.2.0 (2018-02-02)
 ~~~~~~~~~~~~~~~~~~~~~

.pre-commit-config.yaml

@@ -14,7 +14,7 @@
 
 
 more.content_security
-=====================
+*********************
 
 Content Security Policy for Morepath
 

HISTORY.rst

@@ -0,0 +1,11 @@
+# development
+-e '.[test,coverage,lint]'
+pre-commit
+tox >= 4
+radon
+
+# version bumper
+bump-my-version
+
+# releaser
+zest.releaser[recommended]

README.rst

@@ -0,0 +1,130 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "more.content_security"
+version = "0.2.0"
+dynamic = ["readme"]
+description = "Content Security Policy for Morepath"
+license = "BSD-3-Clause"
+license-files = ["license/LICENSE"]
+authors = [{name = "Denis Krienbühl", email = "denis@href.ch"}]
+maintainers = [{name = "Henri Hulski", email = "henri@sancode.it"}]
+classifiers = [
+    "Intended Audience :: Developers",
+    "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 :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+]
+requires-python = ">= 3.10"
+dependencies = ["morepath"]
+
+[project.urls]
+Repository = "https://github.com/morepath/more.content_security"
+Issues = "https://github.com/morepath/more.content_security/issues"
+Changelog = "https://github.com/morepath/more.content_security/blob/master/HISTORY.rst"
+
+[project.optional-dependencies]
+test = ["pytest >= 8", "pytest-env", "WebTest"]
+coverage = ["pytest-cov"]
+lint = ["black", "flake8", "flake8-pyproject"]
+
+[tool.setuptools.packages]
+find = {}
+
+[tool.setuptools.dynamic]
+readme = {file = ["README.rst", "HISTORY.rst"]}
+
+[tool.pytest.ini_options]
+minversion = "8.0"
+testpaths = ["more/content_security"]
+addopts = ["-vv"]
+env = ["RUN_ENV=test"]
+
+[tool.coverage.run]
+omit = ["more/content_security/tests/*"]
+source = ["more/content_security"]
+
+[tool.coverage.report]
+show_missing = true
+
+[tool.flake8]
+show-source = true
+ignore = ["E203", "E231", "W503"]
+max-line-length = 88
+
+[tool.bumpversion]
+current_version = "0.2.0"
+commit = true
+message = "Release {new_version}"
+tag = true
+tag_message = "Release {new_version}"
+regex = true
+
+[[tool.bumpversion.files]]
+filename = "pyproject.toml"
+search= 'version = "{current_version}"'
+replace= 'version = "{new_version}"'
+
+[[tool.bumpversion.files]]
+filename = "HISTORY.rst"
+search = """
+---------(?:
+
+unreleased
+~~~~~~~~~~)?
+"""
+replace = """
+---------
+
+{new_version} ({now:%d.%m.%Y})
+~~~~~~~~~~~~~~~~~~~
+"""
+
+[tool.tox]
+requires = ["tox>=4"]
+env_list = [
+    "py310",
+    "py311",
+    "py312",
+    "py313",
+    "py314",
+    "pypy3",
+    "coverage",
+    "pre-commit",
+]
+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:more}"]]
+
+[tool.tox.env.coverage]
+base_python = ["python3"]
+extras = ["test", "coverage"]
+commands = [
+    ["pytest", "--cov", "--cov-fail-under=99", "{posargs:more}"],
+]
+
+[tool.tox.env.pre-commit]
+base_python = ["python3"]
+package = "skip"
+deps = ["pre-commit"]
+commands = [
+    ["pre-commit", "run", "--all-files"],
+]