Move from extras to dependency-groups (#3056)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: gaborbernat

.readthedocs.yml

@@ -1,15 +1,8 @@
 version: 2
 build:
-  os: ubuntu-22.04
-  tools:
-    python: "3"
-python:
-  install:
-    - method: pip
-      path: .
-      extra_requirements:
-        - docs
-sphinx:
-  builder: html
-  configuration: docs/conf.py
-  fail_on_warning: true
+  os: ubuntu-lts-latest
+  tools: {}
+  commands:
+    - curl -LsSf https://astral.sh/uv/install.sh | sh
+    - ~/.local/bin/uv tool install tox --with tox-uv -p 3.14 --managed-python
+    - ~/.local/bin/tox run -e docs -- $READTHEDOCS_OUTPUT/html

pyproject.toml

@@ -51,38 +51,6 @@ dependencies = [
   "platformdirs>=3.9.1,<5",
   "typing-extensions>=4.13.2; python_version<'3.11'",
 ]
-optional-dependencies.docs = [
-  "furo>=2023.7.26",
-  "pre-commit-uv>=4.1.4",
-  "proselint>=0.13",
-  "sphinx>=7.1.2,!=7.3",
-  "sphinx-argparse>=0.4",
-  "sphinx-autodoc-typehints>=3.6.2",
-  "sphinx-copybutton>=0.5.2",
-  "sphinx-inline-tabs>=2025.12.21.14",
-  "sphinxcontrib-mermaid>=2",
-  "sphinxcontrib-towncrier>=0.2.1a0",
-  "towncrier>=23.6",
-]
-optional-dependencies.test = [
-  "covdefaults>=2.3",
-  "coverage>=7.2.7",
-  "coverage-enable-subprocess>=1",
-  "flaky>=3.7",
-  "packaging>=23.1",
-  "pytest>=7.4",
-  "pytest-env>=0.8.2",
-  """\
-  pytest-freezer>=0.4.8; platform_python_implementation=='PyPy' or platform_python_implementation=='GraalVM' or \
-  (platform_python_implementation=='CPython' and sys_platform=='win32' and python_version>='3.13')\
-  """,
-  "pytest-mock>=3.11.1",
-  "pytest-randomly>=3.12",
-  "pytest-timeout>=2.1",
-  "pytest-xdist>=3.5",
-  "setuptools>=68",
-  "time-machine>=2.10; platform_python_implementation=='CPython'",
-]
 urls.Documentation = "https://virtualenv.pypa.io"
 urls.Homepage = "https://github.com/pypa/virtualenv"
 urls.Source = "https://github.com/pypa/virtualenv"
@@ -108,6 +76,59 @@ entry-points."virtualenv.discovery".builtin = "virtualenv.discovery.builtin:Buil
 entry-points."virtualenv.seed".app-data = "virtualenv.seed.embed.via_app_data.via_app_data:FromAppData"
 entry-points."virtualenv.seed".pip = "virtualenv.seed.embed.pip_invoke:PipInvoke"
 
+[dependency-groups]
+dev = [
+  { include-group = "docs" },
+  { include-group = "lint" },
+  { include-group = "pkg-meta" },
+  { include-group = "test" },
+  { include-group = "type" },
+]
+test = [
+  "covdefaults>=2.3",
+  "coverage>=7.2.7",
+  "coverage-enable-subprocess>=1",
+  "flaky>=3.7",
+  "packaging>=23.1",
+  "pytest>=7.4",
+  "pytest-env>=0.8.2",
+  """\
+  pytest-freezer>=0.4.8; platform_python_implementation=='PyPy' or platform_python_implementation=='GraalVM' or \
+  (platform_python_implementation=='CPython' and sys_platform=='win32' and python_version>='3.13')\
+  """,
+  "pytest-mock>=3.11.1",
+  "pytest-randomly>=3.12",
+  "pytest-timeout>=2.1",
+  "pytest-xdist>=3.5",
+  "setuptools>=68",
+  "time-machine>=2.10; platform_python_implementation=='CPython'",
+]
+type = [
+  "ty>=0.0.15",
+  { include-group = "test" },
+]
+docs = [
+  "furo>=2023.7.26",
+  "pre-commit-uv>=4.1.4",
+  "proselint>=0.13",
+  "sphinx>=7.1.2,!=7.3",
+  "sphinx-argparse>=0.4",
+  "sphinx-autodoc-typehints>=3.6.2",
+  "sphinx-copybutton>=0.5.2",
+  "sphinx-inline-tabs>=2025.12.21.14",
+  "sphinxcontrib-mermaid>=2",
+  "sphinxcontrib-towncrier>=0.2.1a0",
+  "towncrier>=23.6",
+]
+lint = [
+  "pre-commit-uv>=4.1.4",
+]
+pkg-meta = [
+  "check-wheel-contents>=0.6.2",
+  "twine>=6.1",
+  "uv>=0.8",
+]
+
 [tool.hatch]
 build.hooks.vcs.version-file = "src/virtualenv/version.py"
 build.targets.sdist.include = [

tox.toml

@@ -23,7 +23,7 @@ skip_missing_interpreters = true
 description = "run tests with {env_name}"
 package = "wheel"
 wheel_build_env = ".pkg"
-extras = [ "test" ]
+dependency_groups = [ "test" ]
 pass_env = [ "CI_RUN", "PYTEST_*", "TERM" ]
 set_env._COVERAGE_SRC = "{env_site_packages_dir}{/}virtualenv"
 set_env.COVERAGE_FILE = "{work_dir}{/}.coverage.{env_name}"
@@ -64,7 +64,7 @@ uv_seed = true
 
 [env.docs]
 description = "build documentation"
-extras = [ "docs" ]
+dependency_groups = [ "docs" ]
 set_env.PYTHONUTF8 = "1"
 commands = [
   [ "pre-commit", "run", "docstrfmt", "--all-files" ],
@@ -74,11 +74,10 @@ commands = [
     "-d",
     "{env_tmp_dir}{/}doctree",
     "docs",
-    "{work_dir}{/}docs_out",
     "--color",
     "-b",
     "html",
-    { replace = "posargs", extend = true, default = [ "-W" ] },
+    { replace = "posargs", extend = true, default = [ "-W", "{work_dir}{/}docs_out" ] },
   ],
   [
     "python",
@@ -93,7 +92,7 @@ commands = [
 [env.fix]
 description = "format the code base to adhere to our styles, and complain about what we cannot do automatically"
 skip_install = true
-deps = [ "pre-commit-uv>=4.1.4" ]
+dependency_groups = [ "lint" ]
 commands = [ [ "pre-commit", "run", "--all-files", "--show-diff-on-failure" ] ]
 
 [env.graalpy]
@@ -112,7 +111,7 @@ commands = [
 [env.readme]
 description = "check that the long description is valid"
 skip_install = true
-deps = [ "check-wheel-contents>=0.6.2", "twine>=6.1", "uv>=0.8" ]
+dependency_groups = [ "pkg-meta" ]
 commands = [
   [ "uv", "build", "--sdist", "--wheel", "--out-dir", "{env_tmp_dir}", "." ],
   [ "twine", "check", "{env_tmp_dir}{/}*" ],
@@ -121,7 +120,7 @@ commands = [
 
 [env.type]
 description = "run type checker (ty) against Python 3.14"
-deps = [ "ty>=0.0.15" ]
+dependency_groups = [ "type" ]
 commands = [ [ "python", "-m", "ty", "check", "src/virtualenv", "--python-version", "3.14" ] ]
 
 [env.upgrade]
@@ -142,7 +141,7 @@ commands = [ [ "python", "release.py", { replace = "posargs", extend = true } ]
 [env.dev]
 description = "generate a DEV environment"
 package = "editable"
-extras = [ "docs", "test" ]
+dependency_groups = [ "dev" ]
 commands = [
   [ "uv", "pip", "tree" ],
   [ "python", "-c", "import sys; print(sys.executable)" ],