Improve pyproject.toml

tomschr · tomschr · commit f9a70315e2c0 · 2022-05-29T18:23:19.000+02:00
* Use setuptools
* Add metadata
* Use dynamic version from semver.__about__.__version__
* Add build.sh script to call build module
diff --git a/build.sh b/build.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# A simple, correct PEP 517 build frontend
+# See also https://pypi.org/project/build/
+
+/usr/bin/env python3 --version
+/usr/bin/env python3 -m pip install build
+/usr/bin/env python3 -m build --version
+echo "-----"
+/usr/bin/env python3 -m build "$@"
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,25 +1,29 @@
+#
+#
+# See also https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html
+
 [build-system]
 requires = [
   # sync with setup.py until we discard non-pep-517/518
-  "setuptools>=40.0",
+  "setuptools>=62.0",
   "setuptools-scm",
   "wheel",
+  "build",
 ]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "semver"
-version = "3.0.0-alpha0"
 description = "Python helper for Semantic Versioning (http://semver.org/)"
-readme = "README.rst"
 requires-python = ">=3.6"
 license = {file = "LICENSE.txt"}
-keywords = ["semantic versioning", "version", "semver", ]
+keywords = ["semantic versioning", "version", "semver",]
 authors = [
   {name = "Kostiantyn Rybnikov", email = "k-bx@k-bx.com"}
 ]
 maintainers = [
-  {name = "Thomas Schraitle", email = ""}
+  {name = "Sebastien Celles", email = "s.celles@gmail.com"},
+  {name = "Tom Schraitle", email = "tom_schr@web.de"},
 ]
 classifiers=[
         # See https://pypi.org/pypi?%3Aaction=list_classifiers
@@ -33,35 +37,51 @@ classifiers=[
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
-        # "Programming Language :: Python :: Implementation :: PyPy",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Software Development :: Libraries :: Python Modules",
 ]
+dynamic = ["version"]
 
-[project.optional-dependencies]
-test = [
-  "pytest",
-  "pytest-cov[all]",
-]
-doc = ["sphinx",
-       "sphinx-argparse",
-]
+[tool.setuptools.dynamic]
+version = {attr = "semver.__about__.__version__"}
 
+[project.readme]
+file = "README.rst"
+content-type = "text/x-rst"
 
 [project.urls]
-homepage = "https://github.com/python-semver/python-semver"
-documentation = "https://python-semver.rtfd.io/"
-changelog = "https://github.com/python-semver/python-semver/blob/master/CHANGELOG.rst"
+Homepage = "https://github.com/python-semver/python-semver"
+Changelog = "https://python-semver.readthedocs.io/en/latest/changelog.html"
+Documentation = "https://python-semver.rtfd.io"
+Releases = "https://github.com/python-semver/python-semver/releases"
+"Bug Tracker" = "https://github.com/python-semver/python-semver/issues"
 
 [project.scripts]
-pysemver = "semver:main"
+pysemver = "semver.cli:main"
+
+[tool.setuptools]
+# package-dir = {"" = "src"}
+include-package-data = true
 
+[tool.setuptools.packages.find]
+where = ["src"]
+namespaces = false
 
-[tool.flit.metadata]
-module = "semver"
-homepage = "https://github.com/python-semver/python-semver"
-license = "License :: OSI Approved :: BSD License"
+[tool.setuptools.package-data]
+semver = ["py.typed"]
 
 
+[project.optional-dependencies]
+test = [
+  "pytest",
+  "pytest-cov[all]",
+]
+doc = [
+  "sphinx",
+  "sphinx-argparse",
+]
+
 
 [tool.black]
 line-length = 88
@@ -78,7 +98,7 @@ include = '''
 
 [tool.towncrier]
 package = "semver"
-# package_dir = "src"
+package_dir = "src"
 filename = "CHANGELOG.rst"
 directory = "changelog.d/"
 title_format = "Version {version}"
@@ -125,52 +145,3 @@ template = "changelog.d/_template.rst"
   directory = "removal"
   name = "Removals"
   showcontent = true
-
-
-[tool.poetry]
-name = "semver"
-version = "2.9.0"
-description = "Python helper for Semantic Versioning (http://semver.org/)"
-authors = [
-    "Kostiantyn Rybnikov <k-bx@k-bx.com>",
-    "Sébastien Celles <s.celles@gmail.com>",
-]
-license = "BSD-3-Clause"
-readme = "README.rst"
-homepage = "https://github.com/python-semver/python-semver"
-repository = "https://github.com/python-semver/python-semver"
-documentation = "https://python-semver.readthedocs.io/en/latest/"
-keywords = ["semantic versioning", "semver", "version", ]
-classifiers = [
-    "Topic :: Software Development",
-    "Topic :: Software Development :: Libraries :: Python Modules",
-    "Environment :: Web Environment",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: BSD License",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.6",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-]
-packages = [
-    { include = "src/semver/" },
-    ]
-include = ["CHANGELOG.rst", "CONTRIBUTORS", "README.rst"]
-
-
-[tool.poetry.scripts]
-pysemver = "semver:main"
-
-
-[tool.poetry.dependencies]
-python = "^3.5"
-
-
-[tool.poetry.dev-dependencies]
-pytest = "^3.0"
-flake8 = "^3.7"
-isort = "^4.3"
-
diff --git a/setup.cfg b/setup.cfg
@@ -31,6 +31,7 @@ classifiers =
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
     Topic :: Software Development :: Libraries :: Python Modules
 license = BSD
 
