py: Merge dependencies

docs/ug/documentation.md

@@ -7,7 +7,7 @@ theme](https://squidfunk.github.io/mkdocs-material/). Before building the
 documentation, make sure you have the required dependencies installed:
 
 ```shell
-pip install .[docs]
+pip install .
 ```
 
 After everything is installed, you can build a static copy of the `html` documentation by

pyproject.toml

@@ -14,7 +14,6 @@ authors = [
 dynamic = ["version"]
 dependencies = [
     # Keep sorted.
-    # General dependencies.
     "bin2coe",
     "dataclasses",
     "editorconfig-checker==2.3.51",
@@ -27,7 +26,13 @@ dependencies = [
     "jsonschema",
     "mako",
     "matplotlib",
+    "mkdocs",
     "mkdocs-material",
+    "mkdocs-include-markdown-plugin",
+    "mkdocs-macros-plugin",
+    "mkdocstrings",
+    "mkdocstrings-python",
+    "numpy",
     "pandas",
     "prettytable",
     "progressbar2",
@@ -40,21 +45,8 @@ dependencies = [
     "scikit-learn",
     "tabulate",
     "termcolor",
-    "yamllint",
-    # DNN lib dependencies.
-    "numpy",
     "torch",
-    "json5"
-]
-
-[project.optional-dependencies]
-docs = [
-    "mkdocs",
-    "mkdocs-material",
-    "mkdocs-include-markdown-plugin",
-    "mkdocs-macros-plugin",
-    "mkdocstrings",
-    "mkdocstrings-python",
+    "yamllint"
 ]
 
 [tool.setuptools.package-dir]

util/container/Dockerfile

@@ -161,7 +161,7 @@ COPY pyproject.toml .
 COPY sw/dnn ./sw/dnn
 COPY sw/blas ./sw/blas
 COPY util ./util
-RUN pip install .[docs]
+RUN pip install .
 # Add Verilator to PATH
 ENV PATH="/tools/verilator/bin:${PATH}"
 ENV VLT_ROOT="/tools/verilator/share/verilator/"