Adopt PEP-621 packaging (#9)

Author: ssbarnea

.github/workflows/release.yml

@@ -26,11 +26,11 @@ jobs:
       - name: Check out src from Git
         uses: actions/checkout@v3
         with:
-          fetch-depth: 0  # needed by setuptools-scm
+          fetch-depth: 0 # needed by setuptools-scm
       - name: Build dists
         run: python -m tox
       - name: Publish to pypi.org
-        if: >-  # "create" workflows run separately from "push" & "pull_request"
+        if: >- # "create" workflows run separately from "push" & "pull_request"
           github.event_name == 'release'
         uses: pypa/gh-action-pypi-publish@release/v1
         with:

.github/workflows/tox.yml

@@ -48,7 +48,6 @@ jobs:
       PYTEST_REQPASS: 1
 
     steps:
-
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # needed by setuptools-scm

.gitignore

@@ -127,3 +127,4 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+src/pytest_plus/_version.py

.pre-commit-config.yaml

@@ -3,6 +3,19 @@ ci:
   exclude:
     - pip-tools
 repos:
+  - repo: meta
+    hooks:
+      - id: check-useless-excludes
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    # keep it before yamllint
+    rev: v3.0.0-alpha.4
+    hooks:
+      - id: prettier
+        always_run: true
+        additional_dependencies:
+          - prettier
+          - prettier-plugin-toml
+          - prettier-plugin-sort-json
   - repo: https://github.com/PyCQA/doc8.git
     rev: v1.1.0
     hooks:
@@ -51,15 +64,15 @@ repos:
     rev: 6.12.1
     hooks:
       - id: pip-compile
-        entry: pip-compile --resolver=backtracking -q --no-annotate --output-file=requirements.txt pyproject.toml --extra docs --extra test --strip-extras --unsafe-package ansible-core
+        entry: pip-compile --resolver=backtracking -q --no-annotate --output-file=requirements.txt pyproject.toml --extra test --strip-extras
         language: python
         files: ^(requirements\.txt|pyproject\.toml)$
         alias: deps
         language_version: "3.9" # minimal we support officially
         additional_dependencies:
           - pip>=22.3.1
       - id: pip-compile
-        entry: pip-compile --resolver=backtracking -q --no-annotate --output-file=requirements.txt pyproject.toml --extra docs --extra test --strip-extras --unsafe-package ansible-core --upgrade
+        entry: pip-compile --resolver=backtracking -q --no-annotate --output-file=requirements.txt pyproject.toml --extra test --strip-extras --upgrade
         language: python
         files: ^(requirements\.txt|pyproject\.toml)$
         alias: up

MANIFEST.in

@@ -8,8 +8,8 @@
 This plugin aims to be used to host multiple basic pytest extensions that meet
 the following criteria:
 
-* Keep py36 compatibility
-* Downgrade gracefully, meaning that if the plugin is removed, you will still
+- Keep py36 compatibility
+- Downgrade gracefully, meaning that if the plugin is removed, you will still
   be able to run pytest
 
 ## PYTEST_REQPASS
@@ -20,7 +20,7 @@ not exactly 123, pytest will return exit code 1.
 
 This feature is aimed for CI usage in order to prevent accidental skipping of
 some tests. We do expect users to define this variable within their own CI job
-definitions.  The number of tests executed is likely to be dependent on the CI
+definitions. The number of tests executed is likely to be dependent on the CI
 job.
 
 We discourage defining this inside places like `tox.ini` because when a
@@ -29,9 +29,9 @@ tests. Also, this feature makes no sense if you try to mention a specific test.
 
 ## Links
 
-* [MIT](http://opensource.org/licenses/MIT)
-* [file an issue](https://github.com/pytest-dev/pytest-plus/issues)
-* [pytest](https://github.com/pytest-dev/pytest)
-* [tox](https://tox.readthedocs.io/en/latest/)
-* [pip](https://pypi.org/project/pip/)
-* [PyPI](https://pypi.org/project)
+- [MIT](http://opensource.org/licenses/MIT)
+- [file an issue](https://github.com/pytest-dev/pytest-plus/issues)
+- [pytest](https://github.com/pytest-dev/pytest)
+- [tox](https://tox.readthedocs.io/en/latest/)
+- [pip](https://pypi.org/project/pip/)
+- [PyPI](https://pypi.org/project)

README.md

@@ -1,8 +1,62 @@
 [build-system]
 requires = [
-  "setuptools >= 41.0.0",
-  "setuptools_scm >= 1.15.0",
-  "setuptools_scm_git_archive >= 1.0",
-  "wheel",
+  "setuptools >= 63.0.0", # required by pyproject+setuptools_scm integration
+  "setuptools_scm[toml] >= 7.0.5", # required for "no-local-version" scheme
+
 ]
 build-backend = "setuptools.build_meta"
+
+[project]
+# https://peps.python.org/pep-0621/#readme
+requires-python = ">=3.8"
+dynamic = ["version"]
+name = "pytest-plus"
+description = "PyTest Plus Plugin :: extends pytest functionality"
+readme = "README.md"
+authors = [{ "name" = "Sorin Sbarnea", "email" = "[email protected]" }]
+maintainers = [
+  { "name" = "Sorin Sbarnea", "email" = "[email protected]" }
+]
+license = { text = "MIT" }
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "Environment :: Console",
+  "Framework :: Pytest",
+  "Intended Audience :: Developers",
+  "Intended Audience :: Information Technology",
+  "Intended Audience :: System Administrators",
+  "License :: OSI Approved :: MIT License",
+  "Natural Language :: English",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python",
+  "Topic :: Software Development :: Quality Assurance",
+  "Topic :: Software Development :: Testing",
+  "Topic :: System :: Systems Administration",
+  "Topic :: Utilities",
+]
+keywords = ["testing", "pytest", "plugin"]
+dependencies = ["pytest>=6.0.1", "more_itertools>=8.4.0"]
+
+[project.urls]
+homepage = "https://github.com/pytest-dev/pytest-plus"
+repository = "https://github.com/pytest-dev/pytest-plus"
+changelog = "https://github.com/pytest-dev/pytest-plus/releases"
+
+[project.optional-dependencies]
+test = ["coverage>=7.0.0", "pytest-html"]
+
+[project.entry-points.pytest11]
+plus = "pytest_plus"
+
+[tool.pytest.ini_options]
+addopts = "-p no:flaky"
+
+[tool.setuptools_scm]
+local_scheme = "no-local-version"
+write_to = "src/pytest_plus/_version.py"

pyproject.toml

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
-#    pip-compile --extra=docs --extra=test --no-annotate --output-file=requirements.txt --resolver=backtracking --strip-extras --unsafe-package=ansible-core pyproject.toml
+#    pip-compile --extra=test --no-annotate --output-file=requirements.txt --resolver=backtracking --strip-extras pyproject.toml
 #
 attrs==22.1.0
 coverage==7.0.0

pytest.ini

@@ -1,6 +1,6 @@
 # For more information about tox, see https://tox.readthedocs.io/en/latest/
 [tox]
-minversion = 3.9.0
+minversion = 4.0
 envlist =
     lint
     py
@@ -83,7 +83,5 @@ commands =
   pre-commit run --all-files --show-diff-on-failure --hook-stage manual schemas
   # Update pre-commit hooks
   pre-commit autoupdate
-  # Update npm deps
-  bash -c "cd src/schemas && npm run deps"
   # We fail if files are modified at the end
   git diff --exit-code