Reuse extras instead of dependency groups (#2307)

Signed-off-by: Bernát Gábor <[email protected]>

.github/workflows/codspeed.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Install the latest version of uv
         uses: astral-sh/setup-uv@v5
       - name: Install dependencies
-        run: uv sync
+        run: uv sync --all-extras
       - name: Run benchmarks
         uses: CodSpeedHQ/action@v3
         with:

pyproject.toml

@@ -29,7 +29,6 @@ classifiers = [
 dynamic = [
   "version",
 ]
-
 dependencies = [
   "argcomplete>=2.10.1,<4",
   "black>=19.10b0",
@@ -42,7 +41,12 @@ dependencies = [
   "pyyaml>=6.0.1",
   "tomli>=2.2.1,<3; python_version<='3.11'",
 ]
-
+optional-dependencies.all = [
+  "datamodel-code-generator[debug]",
+  "datamodel-code-generator[graphql]",
+  "datamodel-code-generator[http]",
+  "datamodel-code-generator[validation]",
+]
 optional-dependencies.debug = [
   "pysnooper>=0.4.1,<2",
 ]
@@ -63,15 +67,11 @@ scripts.datamodel-codegen = "datamodel_code_generator.__main__:main"
 [dependency-groups]
 dev = [
   { include-group = "coverage" },
-  { include-group = "debug" },
   { include-group = "docs" },
   { include-group = "fix" },
-  { include-group = "graphql" },
-  { include-group = "http" },
   { include-group = "pkg-meta" },
   { include-group = "test" },
   { include-group = "type" },
-  { include-group = "validation" },
 ]
 test = [
   "diff-cover>=7.7",
@@ -85,10 +85,6 @@ test = [
   "pytest-mock>=3.14",
   "pytest-xdist>=3.3.1",
   "setuptools; python_version<'3.9'",
-  { include-group = "debug" },
-  { include-group = "graphql" },
-  { include-group = "http" },
-  { include-group = "validation" },
 ]
 type = [
   "pyright>=1.1.393",
@@ -102,19 +98,6 @@ docs = [
   "mkdocs>=1.6",
   "mkdocs-material>=9.5.31",
 ]
-debug = [
-  "pysnooper>=0.4.1,<2",
-]
-graphql = [
-  "graphql-core>=3.2.3",
-]
-http = [
-  "httpx>=0.24.1",
-]
-validation = [
-  "openapi-spec-validator>=0.2.8,<0.7",
-  "prance>=0.18.2",
-]
 black19-pydantic18 = [ "black==19.10b0", "pydantic==1.8.2" ]
 black22 = [ "black==22.1" ]
 black23 = [ "black==23.12" ]

tox.ini

@@ -23,6 +23,8 @@ runner = uv-venv-lock-runner
 description = run the unit tests with pytest under {base_python}
 package = wheel
 wheel_build_env = .pkg
+extras =
+    all
 pass_env =
     DIFF_AGAINST
     HTTP_IGNORE_TLS
@@ -106,6 +108,7 @@ dependency_groups = type
 
 [testenv:docs]
 description = generate documentation
+extras =
 commands =
     mkdocs build --verbose --clean --strict -d {posargs:{env_tmp_dir}}
     python -c 'print("Documentation generated at file://{posargs:{env_tmp_dir}}{/}index.html")'