Move optional dependencies from dev_requirements to pyproject.toml

Hochfrequenz · Sep 26, 2024 · 59f9fb8 · 59f9fb8
1 parent d1c88c6
commit 59f9fb8
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 188 deletions.
diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r dev_requirements/requirements-formatting.txt
+          pip install .[formatting]
       - name: ${{ matrix.tool }} Code Formatter
         run: |
           ${{ matrix.tool }} . --check
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -35,7 +35,11 @@ jobs:
 
    build-n-publish:
      name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
-     runs-on: ubuntu-latest
+     runs-on: ${{ matrix.os }}
+     strategy:
+       matrix:
+         python-version: [ "3.12" ]
+         os: [ ubuntu-latest ]
      # Specifying a GitHub environment, # Specifying a GitHub environment, which is strongly recommended by PyPI: https://docs.pypi.org/trusted-publishers/adding-a-publisher/
      # you have to create an environment in your repository settings and add the environment name here
      environment: release
@@ -52,7 +56,7 @@ jobs:
        - name: Install dependencies
          run: |
            python -m pip install --upgrade pip
-           pip install -r dev_requirements/requirements-packaging.txt
+           pip install .[test_packaging]
        - name: Build wheel and source distributions
          run: |
            python -m build

diff --git a/dev_requirements/requirements-coverage.in b/dev_requirements/requirements-coverage.in
diff --git a/dev_requirements/requirements-coverage.txt b/dev_requirements/requirements-coverage.txt
diff --git a/dev_requirements/requirements-formatting.in b/dev_requirements/requirements-formatting.in
diff --git a/dev_requirements/requirements-formatting.txt b/dev_requirements/requirements-formatting.txt
diff --git a/dev_requirements/requirements-linting.in b/dev_requirements/requirements-linting.in
diff --git a/dev_requirements/requirements-linting.txt b/dev_requirements/requirements-linting.txt
diff --git a/dev_requirements/requirements-packaging.in b/dev_requirements/requirements-packaging.in
diff --git a/dev_requirements/requirements-packaging.txt b/dev_requirements/requirements-packaging.txt
diff --git a/dev_requirements/requirements-tests.in b/dev_requirements/requirements-tests.in
diff --git a/dev_requirements/requirements-tests.txt b/dev_requirements/requirements-tests.txt
diff --git a/dev_requirements/requirements-type_check.in b/dev_requirements/requirements-type_check.in
diff --git a/dev_requirements/requirements-type_check.txt b/dev_requirements/requirements-type_check.txt
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,6 +21,32 @@ classifiers = [
 dependencies = []     # add all the dependencies from requirements.in here, too
 dynamic = ["readme", "version"]
 
+[project.optional-dependencies]
+coverage = [
+    "coverage==7.6.1"
+]
+formatting = [
+    "black==24.8.0",
+    "isort==5.13.2"
+]
+linting = [
+    "pylint==3.3.0"
+]
+spellcheck = [
+    "codespell==2.3.0"
+]
+test_packaging = [
+    "build==1.2.2",
+    "twine==5.1.1"
+]
+tests = [
+    "pydantic==2.9.2",
+    "pytest==8.3.3"
+]
+type_check = [
+    "mypy==1.11.2"
+]
+
 [project.urls]
 Changelog = "https://github.com/Hochfrequenz/python-generics/releases"
 Homepage = "https://github.com/Hochfrequenz/python-generics"

diff --git a/tox.ini b/tox.ini
@@ -14,7 +14,7 @@ commands = python -m pip install --upgrade pip
 # the tests environment is called by the Github action that runs the unit tests
 deps =
     -r requirements.txt
-    -r dev_requirements/requirements-tests.txt
+    .[tests]
 setenv = PYTHONPATH = {toxinidir}/src
 commands =
     python -m pytest --basetemp={envtmpdir} {posargs}
@@ -23,7 +23,7 @@ commands =
 # the tests environment is called by the Github action that runs the unit tests
 deps =
     -r requirements.txt
-    -r dev_requirements/requirements-tests.txt
+    .[tests]
 setenv = PYTHONPATH = {toxinidir}/src
 commands =
     python -m pytest --basetemp={envtmpdir} --ignore=unittests/test_py_312.py {posargs}
@@ -32,7 +32,7 @@ commands =
 # the linting environment is called by the Github Action that runs the linter
 deps =
     {[testenv:tests-py312]deps}
-    -r dev_requirements/requirements-linting.txt
+    .[linting]
     # add your fixtures like e.g. pytest_datafiles here
 setenv = PYTHONPATH = {toxinidir}/src
 commands =
@@ -45,7 +45,7 @@ commands =
 setenv = PYTHONPATH = {toxinidir}/src
 deps =
     {[testenv:tests-py312]deps}
-    -r dev_requirements/requirements-type_check.txt
+    .[type_check]
 commands =
     mypy --show-error-codes src/generics
     mypy --show-error-codes --enable-incomplete-feature=NewGenericSyntax unittests
@@ -56,7 +56,7 @@ commands =
 changedir = unittests
 deps =
     {[testenv:tests-py312]deps}
-    -r dev_requirements/requirements-coverage.txt
+    .[coverage]
 setenv = PYTHONPATH = {toxinidir}/src
 commands =
     coverage run -m pytest --basetemp={envtmpdir} {posargs}
@@ -71,7 +71,7 @@ deps =
     {[testenv:linting]deps}
     {[testenv:type_check]deps}
     {[testenv:coverage]deps}
-    -r dev_requirements/requirements-formatting.txt
+    .[formatting]
     pip-tools
     pre-commit
 commands =
@@ -83,7 +83,7 @@ commands =
 [testenv:test_packaging]
 skip_install = true
 deps =
-    -r dev_requirements/requirements-packaging.txt
+    .[test_packaging]
 commands =
     python -m build
     twine check dist/*