From b509a61dd7d75a5f1600b20bb2799c8dd6d7fa74 Mon Sep 17 00:00:00 2001
From: Remco de Boer <29308176+redeboer@users.noreply.github.com>
Date: Sat, 20 Jan 2024 22:42:50 +0100
Subject: [PATCH] DX: drop support for Python 3.6 (#52)

* DOC: update links to compwa.github.io
* FIX: swith to new `tab-set` syntax
* MAINT: add missing newline
* FIX: remove `jupyter` from `doc` dependencies
* FIX: remove `sphinx-math-dollar` extension
* FIX: remove `sphobjinv` from requirements
* FIX: remove `sphinx-panels` from dependencies
---
 .cspell.json                     |  2 -
 .github/pull_request_template.md |  2 +-
 .pre-commit-config.yaml          | 27 +++++----
 docs/appendices/tips.md          | 12 ++--
 docs/conf.py                     | 15 +++--
 docs/contribute.md               |  4 +-
 pyproject.toml                   | 98 +++++++++++++++++++++++++++++---
 setup.cfg                        | 75 ------------------------
 setup.py                         |  6 --
 9 files changed, 122 insertions(+), 119 deletions(-)
 delete mode 100644 setup.cfg
 delete mode 100644 setup.py

diff --git a/.cspell.json b/.cspell.json
index d95c25e..f2c0ff0 100644
--- a/.cspell.json
+++ b/.cspell.json
@@ -34,8 +34,6 @@
     "docs/conf.py",
     "labels.toml",
     "pyproject.toml",
-    "setup.cfg",
-    "setup.py",
     "tox.ini",
     "typings"
   ],
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 14b8085..2d5c6e9 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,7 +2,7 @@
 
 <!--
 For the PR title, follow a conventional commit message style:
-https://compwa-org.readthedocs.io/en/stable/develop.html#commit-conventions
+https://compwa.github.io/develop#commit-conventions
 -->
 
 <!--
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b376c54..8eb7a7c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,20 +12,6 @@ repos:
       - id: check-hooks-apply
       - id: check-useless-excludes
 
-  - repo: https://github.com/ComPWA/policy
-    rev: 0.2.0
-    hooks:
-      - id: check-dev-files
-        args:
-          - --allow-labels
-          - --ignore-author
-          - --keep-issue-templates
-          - --no-notebooks
-          - --no-prettierrc
-          - --repo-name=bossdoc
-          - --repo-title=BOSS Documentation
-      - id: format-setup-cfg
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
@@ -51,6 +37,19 @@ repos:
     hooks:
       - id: black
 
+  - repo: https://github.com/ComPWA/policy
+    rev: 0.2.0
+    hooks:
+      - id: check-dev-files
+        args:
+          - --allow-labels
+          - --ignore-author
+          - --keep-issue-templates
+          - --no-notebooks
+          - --no-prettierrc
+          - --repo-name=bossdoc
+          - --repo-title=BOSS Documentation
+
   - repo: https://github.com/streetsidesoftware/cspell-cli
     rev: v8.3.0
     hooks:
diff --git a/docs/appendices/tips.md b/docs/appendices/tips.md
index 8b0a5af..37a162a 100644
--- a/docs/appendices/tips.md
+++ b/docs/appendices/tips.md
@@ -93,7 +93,7 @@ In addition, you may need to set the remote platform to `"linux"`:
 where `"lxslc7.ihep.ac.cn"` is the name of the host in your
 [SSH Config file](https://man7.org/linux/man-pages/man5/ssh_config.5.html).
 
-::::{tip}
+:::::{tip}
 
 VSCode Remote SSH installs some files into your home directory on the server, in a
 folder called `.vscode-server`. This will not work if you experience this (rather
@@ -101,7 +101,9 @@ common) problem: {ref}`read-write-access`. It is therefore recommended that you
 `.vscode-server` folder to a directory where you always have read-write access and then
 create a symbolic link to that folder in your actual home folder. Do this as follows:
 
-:::{tabbed} .vscode-server does not yet exist
+::::{tab-set}
+
+:::{tab-item} `.vscode-server` does not yet exist
 
 ```shell
 cd ~
@@ -111,7 +113,7 @@ ln -s /besfs5/users/$USER/.vscode-server
 
 :::
 
-:::{tabbed} .vscode-server already exists
+:::{tab-item} `.vscode-server` already exists
 
 ```shell
 cd ~
@@ -120,12 +122,12 @@ ln -s /besfs5/users/$USER/.vscode-server
 ```
 
 :::
+::::
 
 Another major advantage of this set-up is that you won't have problems with
 [data quota](../tutorials/getting-started/data-quota.md) when the
 `.vscode-server` grows over time.
-
-::::
+:::::
 
 ### Language navigation for BOSS
 
diff --git a/docs/conf.py b/docs/conf.py
index a0e8496..9c25af4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 import os
-from typing import Dict
+from typing import TYPE_CHECKING
 
 from docutils import nodes
 from pybtex.plugin import register_plugin
@@ -15,7 +17,9 @@
     sentence,
     words,
 )
-from sphinx.application import Sphinx
+
+if TYPE_CHECKING:
+    from sphinx.application import Sphinx
 
 # -- Project information -----------------------------------------------------
 project = "BESIII Offline Software System"
@@ -46,8 +50,7 @@
     "sphinx.ext.todo",
     "sphinx_comments",
     "sphinx_copybutton",
-    "sphinx_math_dollar",
-    "sphinx_panels",
+    "sphinx_design",
     "sphinx_thebe",
     "sphinx_togglebutton",
     "sphinxcontrib.bibtex",
@@ -113,7 +116,7 @@
 
 # Intersphinx settings
 intersphinx_mapping = {
-    "compwa-org": ("https://compwa-org.readthedocs.io", None),
+    "compwa": ("https://compwa.github.io", None),
 }
 
 # Settings for autosectionlabel
@@ -185,7 +188,7 @@ def setup(app: Sphinx):
     app.add_role("wiki", autolink("https://en.wikipedia.org/wiki/%s", {"_": " "}))
 
 
-def autolink(pattern: str, replace_mapping: Dict[str, str]):
+def autolink(pattern: str, replace_mapping: dict[str, str]):
     def role(name, rawtext, text: str, lineno, inliner, options={}, content=[]):
         output_text = text
         for search, replace in replace_mapping.items():
diff --git a/docs/contribute.md b/docs/contribute.md
index 463ad61..371e9a6 100644
--- a/docs/contribute.md
+++ b/docs/contribute.md
@@ -70,7 +70,7 @@ in VSCode!
 
 :::{seealso}
 
-{doc}`compwa-org:develop` on the {doc}`ComPWA website <compwa-org:index>`, which uses
-the same set-up.
+{doc}`compwa:develop` on the {doc}`ComPWA website <compwa:index>`, which uses the same
+set-up.
 
 :::
diff --git a/pyproject.toml b/pyproject.toml
index 2181c50..70b87eb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,10 +1,92 @@
 [build-system]
+build-backend = "setuptools.build_meta"
 requires = [
-    "setuptools>=36.2.1", # environment markers
+    "setuptools>=61.2",
     "setuptools_scm",
-    "wheel",
 ]
 
+[project]
+classifiers = [
+    "Development Status :: 2 - Pre-Alpha",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Education",
+    "Intended Audience :: Science/Research",
+    "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+    "Natural Language :: English",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python",
+    "Topic :: Scientific/Engineering :: Physics",
+    "Topic :: Scientific/Engineering",
+]
+description = "Documentation of the BESIII Offline Software System"
+dynamic = ["version"]
+keywords = [
+    "BESIII",
+    "HEP",
+    "IHEP",
+    "particle physics",
+    "particles",
+    "physics",
+]
+license = {text = "GPLv3 or later"}
+name = "bossdoc"
+requires-python = ">=3.7"
+
+[project.optional-dependencies]
+dev = [
+    "bossdoc[doc]",
+    "bossdoc[sty]",
+    "jupyterlab",
+    "jupyterlab-code-formatter",
+    "sphinx-autobuild",
+    "tox >=1.9",
+]
+doc = [
+    "Sphinx >=3",
+    "ipywidgets",
+    "matplotlib",
+    "myst-nb >=0.11", # myst_enable_extensions
+    "sphinx-book-theme",
+    "sphinx-comments",
+    "sphinx-copybutton",
+    "sphinx-design",
+    "sphinx-thebe",
+    "sphinx-togglebutton",
+    "sphinxcontrib-bibtex >=2",
+]
+format = [
+    "black",
+]
+lint = [
+    "ruff",
+]
+sty = [
+    "Sphinx",
+    "bossdoc[format]",
+    "bossdoc[lint]",
+    "docutils",
+    "pre-commit >=1.4.0",
+    "pybtex",
+]
+
+[project.readme]
+content-type = "text/markdown"
+file = "README.md"
+
+[project.urls]
+Changelog = "https://github.com/redeboer/bossdoc/releases"
+Documentation = "http://bes3.rtfd.io"
+Source = "https://github.com/redeboer/bossdoc"
+Tracker = "https://github.com/redeboer/bossdoc/issues"
+
+[tool.setuptools]
+include-package-data = false
+
 [tool.setuptools_scm]
 write_to = "version.py"
 
@@ -25,12 +107,11 @@ exclude = '''
 include = '\.pyi?$'
 preview = true
 target-version = [
-    'py310',
-    'py311',
-    'py36',
-    'py37',
-    'py38',
-    'py39',
+    "py310",
+    "py311",
+    "py37",
+    "py38",
+    "py39",
 ]
 
 [tool.pyright]
@@ -69,6 +150,7 @@ extend-select = [
     "D",
     "EM",
     "ERA",
+    "FA",
     "I",
     "ICN",
     "INP",
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index a3c0355..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,75 +0,0 @@
-[metadata]
-name = BOSS Documentation
-description = Documentation of the BESIII Offline Software System
-long_description = file: README.md
-long_description_content_type = text/markdown
-project_urls =
-    Tracker = https://github.com/redeboer/bossdoc/issues
-    Changelog = https://github.com/redeboer/bossdoc/releases
-    Documentation = http://bes3.rtfd.io
-    Source = https://github.com/redeboer/bossdoc
-license = GPLv3 or later
-keywords =
-    BESIII
-    HEP
-    IHEP
-    particle physics
-    particles
-    physics
-classifiers =
-    Development Status :: 2 - Pre-Alpha
-    Intended Audience :: Developers
-    Intended Audience :: Education
-    Intended Audience :: Science/Research
-    License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
-    Natural Language :: English
-    Operating System :: OS Independent
-    Programming Language :: Python
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
-    Topic :: Scientific/Engineering
-    Topic :: Scientific/Engineering :: Physics
-
-[options]
-python_requires = >=3.6
-setup_requires =
-    setuptools_scm
-
-[options.extras_require]
-doc =
-    ipywidgets
-    jupyter
-    matplotlib
-    myst-nb >=0.11  # myst_enable_extensions
-    Sphinx >=3
-    sphinx-book-theme
-    sphinx-comments
-    sphinx-copybutton
-    sphinx-math-dollar
-    sphinx-panels
-    sphinx-thebe
-    sphinx-togglebutton
-    sphinxcontrib-bibtex >=2
-    sphobjinv
-format =
-    black
-lint =
-    ruff
-sty =
-    %(format)s
-    %(lint)s
-    docutils
-    pre-commit >=1.4.0
-    pybtex
-    Sphinx
-dev =
-    %(doc)s
-    %(sty)s
-    jupyterlab
-    jupyterlab-code-formatter
-    sphinx-autobuild
-    tox >=1.9  # for skip_install, use_develop
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 9329697..0000000
--- a/setup.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from setuptools import setup
-
-setup(
-    use_scm_version=True,
-    setup_requires=["setuptools_scm"],
-)