Move readthedocs.yaml to manual pip install

Author: CPBridge

.mailmap

@@ -0,0 +1,34 @@
+# .mailmap - Consolidate git author identities
+# See: https://git-scm.com/docs/gitmailmap
+#
+# Format: Canonical Name <canonical@email.com> Old Name <old@email.com>
+
+# Afshin Zade
+Afshin Zade <afshin.akbarzadeh@childrens.harvard.edu> afshinmessiah <afshin.akbarzadeh@childrens.harvard.edu>
+Afshin Zade <afshin.akbarzadeh@childrens.harvard.edu> Afshin Zade <42010605+afshinmessiah@users.noreply.github.com>
+
+# Andrey Fedorov
+Andrey Fedorov <andrey.fedorov@gmail.com> <fedorov@bwh.harvard.edu>
+
+# Christopher P. Bridge
+Christopher P. Bridge <chrisbridge44@googlemail.com> Chris Bridge <cbridge@partners.org>
+Christopher P. Bridge <chrisbridge44@googlemail.com> Christopher Bridge <cbridge@partners.org>
+Christopher P. Bridge <chrisbridge44@googlemail.com> Christopher Bridge <chrisbridge44@gmail.com>
+Christopher P. Bridge <chrisbridge44@googlemail.com> CPBridge <chrisbridge44@googlemail.com>
+Christopher P. Bridge <chrisbridge44@googlemail.com> Christopher P Bridge <cpb28@glacier.nmr.mgh.harvard.edu>
+Christopher P. Bridge <chrisbridge44@googlemail.com> Chris Bridge <chrisbridge44@googlemail.com>
+
+# Dimitri Papadopoulos Orfanos
+Dimitri Papadopoulos Orfanos <3234522+DimitriPapadopoulos@users.noreply.github.com> Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com>
+
+# Erik O Gabrielsson
+Erik O Gabrielsson <erik.o.gabrielsson@sectra.com> erikogabrielsson <83275777+erikogabrielsson@users.noreply.github.com>
+Erik O Gabrielsson <erik.o.gabrielsson@sectra.com> Erik O Gabrielsson <83275777+erikogabrielsson@users.noreply.github.com>
+
+# Markus D. Herrmann
+Markus D. Herrmann <hackermd@protonmail.com> hackermd <hackermd@protonmail.com>
+Markus D. Herrmann <hackermd@protonmail.com> Markus D. Herrmann <hackermd@users.noreply.github.com>
+Markus D. Herrmann <hackermd@protonmail.com> hackermd <markusdherrmann@gmail.com>
+
+# Robin Fourcade
+Robin Fourcade <29704178+RobinFrcd@users.noreply.github.com> RobinFrcd <29704178+RobinFrcd@users.noreply.github.com>

.readthedocs.yaml

@@ -13,14 +13,28 @@ build:
   os: ubuntu-24.04
   tools:
     python: "3.14"
+<<<<<<< HEAD
   jobs:
     install:
       - pip install --upgrade pip
       - pip install . --group 'docs'
+=======
+>>>>>>> ec92b0750055472edb2bfb1e3c4a11ad2d506df8
 
 # Build documentation with MkDocs
 #mkdocs:
 #  configuration: mkdocs.yml
 
 # Optionally build your docs in additional formats such as PDF and ePub
 formats: all
+<<<<<<< HEAD
+=======
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  install:
+    - method: pip
+      path: .
+      dependency_groups:
+      - docs
+>>>>>>> ec92b0750055472edb2bfb1e3c4a11ad2d506df8

docs/conf.py

@@ -12,8 +12,8 @@
 #
 import os
 import sys
-import pkg_resources
 import datetime
+import importlib.metadata
 
 source_dir = os.path.dirname(__file__)
 pkg_dir = os.path.join(source_dir, '..', '..', 'src', 'highdicom')
@@ -23,14 +23,15 @@
 
 project = 'highdicom'
 copyright = f'2020-{datetime.datetime.now().year}, highdicom contributors'
-author = 'Markus D. Herrmann'
+author = 'Markus D. Herrmann, Christopher P. Bridge'
 
 # The full version, including alpha/beta/rc tags
 try:
-    release = pkg_resources.get_distribution('highdicom').version
-except pkg_resources.DistributionNotFound:
+    release = importlib.metadata.version("highdicom")
+except importlib.metadata.PackageNotFoundError:
     print('Package "highdicom" must be installed to build docs.')
     sys.exit(1)
+
 # The short X.Y version
 version = '.'.join(release.split('.')[:2])
 
@@ -48,7 +49,7 @@
     'sphinxcontrib.autoprogram',
     'sphinx.ext.autodoc',
     'sphinx.ext.napoleon',
-    'sphinx_autodoc_typehints',
+    # 'sphinx_autodoc_typehints',
     'sphinx.ext.extlinks',
 ]
 

pyproject.toml

@@ -56,11 +56,11 @@ test = [
     "pytest-flake8==1.3.0",
 ]
 docs = [
-    "sphinx-autodoc-typehints==1.17.0",
-    "sphinx-pyreverse==0.0.17",
-    "sphinx-rtd-theme==1.0.0",
-    "sphinxcontrib-autoprogram==0.1.7",
-    "sphinxcontrib-websupport==1.2.4",
+    "sphinx-autodoc-typehints==3.9.9",
+    "sphinx-pyreverse==0.0.18",
+    "sphinx-rtd-theme==3.1.0",
+    "sphinxcontrib-autoprogram==0.1.9",
+    "sphinxcontrib-websupport==2.0.0",
 ]
 
 [project.urls]

src/highdicom/seg/sop.py

@@ -218,7 +218,7 @@ def __init__(
         """
         Parameters
         ----------
-        source_images: Sequence[Dataset]
+        source_images: Sequence[pydicom.Dataset]
             Image(s) from which this segmentation was derived. A sequence
             containing either one or more single-frame images, or exactly one
             multi-frame image. Passing the metadata of the image(s) is