From 7f90f0c834576aad04e13e29a1efce4ef69b7448 Mon Sep 17 00:00:00 2001
From: Alex Carney <alcarneyme@gmail.com>
Date: Mon, 9 Oct 2023 20:43:27 +0100
Subject: [PATCH] ext: Move packaging metadata into pyproject.toml

---
 lib/esbonio-extensions/.bumpversion.cfg |  4 +--
 lib/esbonio-extensions/pyproject.toml   | 45 ++++++++++++++++++++++++-
 lib/esbonio-extensions/setup.cfg        | 41 ----------------------
 3 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/lib/esbonio-extensions/.bumpversion.cfg b/lib/esbonio-extensions/.bumpversion.cfg
index 31bc496f9..ae95c4b84 100644
--- a/lib/esbonio-extensions/.bumpversion.cfg
+++ b/lib/esbonio-extensions/.bumpversion.cfg
@@ -3,11 +3,11 @@ current_version = 0.2.2
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(.dev(?P<dev>\d+))?
-serialize = 
+serialize =
 	{major}.{minor}.{patch}.dev{dev}
 	{major}.{minor}.{patch}
 
-[bumpversion:file:setup.cfg]
+[bumpversion:file:pyproject.toml]
 
 [bumpversion:file:esbonio/tutorial.py]
 
diff --git a/lib/esbonio-extensions/pyproject.toml b/lib/esbonio-extensions/pyproject.toml
index e0cea2df9..9d7539b09 100644
--- a/lib/esbonio-extensions/pyproject.toml
+++ b/lib/esbonio-extensions/pyproject.toml
@@ -1,7 +1,50 @@
 [build-system]
-requires = ["setuptools >= 35.0.2", "wheel >= 0.29.0"]
+requires = ["setuptools >= 61.0.0"]
 build-backend = "setuptools.build_meta"
 
+[project]
+name = "esbonio-extensions"
+version = "0.2.2"
+description = "A collection of extensions for Sphinx and the Esbonio language server"
+readme = "README.md"
+requires-python = ">=3.8"
+license = { text = "MIT" }
+authors = [{ name = "Alex Carney", email = "alcarneyme@gmail.com" }]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Topic :: Documentation",
+    "Topic :: Documentation :: Sphinx",
+]
+dependencies = ["esbonio", "platformdirs", "sphinx"]
+
+[project.optional-dependencies]
+dev = [
+    "black",
+    "flake8",
+    "pytest",
+    "pytest-cov",
+    "mock",
+]
+spelling = ["pyspellchecker"]
+tutorial = ["nbformat"]
+
+[project.urls]
+"Bug Tracker" = "https://github.com/swyddfa/esbonio/issues"
+"Documentation" = "https://swyddfa.github.io/esbonio/"
+"Source Code" = "https://github.com/swyddfa/esbonio"
+
+[tool.setuptools.packages.find]
+exclude = ["tests*"]
+
 [tool.towncrier]
 filename = "CHANGES.rst"
 directory = "changes/"
diff --git a/lib/esbonio-extensions/setup.cfg b/lib/esbonio-extensions/setup.cfg
index 47cd23446..6fd2a011a 100644
--- a/lib/esbonio-extensions/setup.cfg
+++ b/lib/esbonio-extensions/setup.cfg
@@ -1,44 +1,3 @@
-[metadata]
-name = esbonio-extensions
-version = 0.2.2
-description = A collection of Sphinx extensions
-long_description = file:README.md
-long_description_content_type = text/markdown
-author = Alex Carney
-author_email = alcarneyme@gmail.com
-license = MIT
-classifiers =
-    Development Status :: 3 - Alpha
-    License :: OSI Approved :: MIT License
-    Programming Language :: Python
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
-    Programming Language :: Python :: 3.12
-    Topic :: Documentation
-    Topic :: Documentation :: Sphinx
-platforms = any
-
-[options]
-python_requires = >=3.8
-packages = find_namespace:
-include_package_data = True
-install_requires =
-    esbonio
-    platformdirs
-    sphinx
-
-[options.packages.find]
-exclude = tests*
-
-[options.extras_require]
-dev = black ; flake8 ; pytest ; pytest-cov ; mock
-spelling = pyspellchecker
-tutorial = nbformat
-
 [flake8]
 max-line-length = 88
 ignore = E501