MNT: Restore doc/test extras

Author: effigies

.github/workflows/stable.yml

@@ -95,7 +95,7 @@ jobs:
         run: pip install archive/nibabel-archive.tgz
       - run: python -c 'import nibabel; print(nibabel.__version__)'
       - name: Install minimum test dependencies
-        run: pip install pytest pytest-doctestplus pytest-xdist
+        run: pip install nibabel[test]
       - name: Run tests
         run: pytest --doctest-modules --doctest-plus -v --pyargs nibabel -n auto
 

pyproject.toml

@@ -56,12 +56,26 @@ dicomfs = ["nibabel[dicom]", "pillow"]
 minc2 = ["h5py"]
 spm = ["scipy"]
 zstd = ["pyzstd >= 0.14.3"]
-# Dev dependencies: Move to tox, keep aliases to avoid breaking workflows
+# For doc and test, make easy to use outside of tox
+# tox should use these with extras instead of duplicating
+doc = [
+  "sphinx",
+  "matplotlib>=1.5.3",
+  "numpydoc",
+  "texext",
+  "tomli; python_version < '3.11'",
+]
+test = [
+  "pytest",
+  "pytest-doctestplus",
+  "pytest-cov",
+  "pytest-httpserver",
+  "pytest-xdist",
+]
+# Remaining: Simpler to centralize in tox
 dev = ["tox"]
-doc = ["tox"]
 doctest = ["tox"]
 style = ["tox"]
-test = ["tox"]
 typing = ["tox"]
 
 [tool.hatch.build.targets.sdist]

tox.ini

@@ -50,12 +50,8 @@ pass_env =
   USER
   LNAME
   USERNAME
+extras = test
 deps =
-  pytest
-  pytest-doctestplus
-  pytest-cov
-  pytest-httpserver
-  pytest-xdist
   # NEP29/SPEC0 + 1yr: Test on minor release series within the last 3 years
   # We're extending this to all optional dependencies
   # This only affects the range that we test on; numpy is the only non-optional
@@ -98,6 +94,7 @@ commands =
 description = "Install and verify imports succeed"
 labels = test
 deps =
+extras =
 install_command = python -I -m pip install {opts} {packages}
 commands =
   python -c "import nibabel; print(nibabel.__version__)"
@@ -106,27 +103,17 @@ commands =
 description = Typical pytest invocation with coverage
 labels = docs
 allowlist_externals = make
-deps =
-  sphinx
-  matplotlib>=1.5.3
-  numpydoc
-  texext
-  tomli; python_version < "3.11"
+extras = doc
 commands =
   make -C doc html
 
 [testenv:doctest]
 description = Typical pytest invocation with coverage
 labels = docs
 allowlist_externals = make
-depends = docs
-deps =
-  sphinx
-  pytest
-  matplotlib>=1.5.3
-  numpydoc
-  texext
-  tomli; python_version < "3.11"
+extras =
+  doc
+  test
 commands =
   make -C doc doctest