Move optional dependencies from dev_requirements to pyproject.toml

Hochfrequenz · Sep 26, 2024 · f78ff31 · f78ff31
1 parent 1421b1f
commit f78ff31
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 247 deletions.
diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
@@ -21,7 +21,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
@@ -45,14 +49,14 @@ jobs:
     needs: tests
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python
+      - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r dev_requirements/requirements-packaging.txt
+          pip install .[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-spell_check.in b/dev_requirements/requirements-spell_check.in
diff --git a/dev_requirements/requirements-spell_check.txt b/dev_requirements/requirements-spell_check.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
@@ -26,6 +26,35 @@ dependencies = [
 ] # add all the dependencies here
 dynamic = ["readme", "version"]
 
+[project.optional-dependencies]
+coverage = [
+    "coverage==7.4.4"
+]
+formatting = [
+    "black==24.8.0",
+    "isort==5.13.2"
+]
+linting = [
+    "pylint==3.2.6",
+    "pylint-pydantic==0.3.2"
+]
+packaging = [
+    "build==1.2.1",
+    "twine==5.1.1"
+]
+spellcheck = [
+    "codespell==2.2.6"
+]
+tests = [
+    "aioresponses==0.7.6",
+    "pytest==8.1.1",
+    "pytest-asyncio==0.23.6"
+]
+type_check = [
+    "mypy[pydantic]==1.8.0",
+    "types-pytz==2024.1.0.20240203"
+]
+
 [project.urls]
 Changelog = "https://github.com/Hochfrequenz/bssclient.py/releases"
 Homepage = "https://github.com/Hochfrequenz/bssclient.py"

diff --git a/tox.ini b/tox.ini
@@ -14,15 +14,15 @@ 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}
 
 [testenv:linting]
 # the linting environment is called by the Github Action that runs the linter
 deps =
     {[testenv:tests]deps}
-    -r dev_requirements/requirements-linting.txt
+    .[linting]
     # add your fixtures like e.g. pytest_datafiles here
 setenv = PYTHONPATH = {toxinidir}/src
 commands =
@@ -35,7 +35,7 @@ commands =
 setenv = PYTHONPATH = {toxinidir}/src
 deps =
     {[testenv:tests]deps}
-    -r dev_requirements/requirements-type_check.txt
+    .[type_check]
 commands =
     mypy --show-error-codes src/bssclient
     mypy --show-error-codes unittests
@@ -46,7 +46,7 @@ commands =
 setenv = PYTHONPATH = {toxinidir}/src
 deps =
     -r requirements.txt
-    -r dev_requirements/requirements-spell_check.txt
+    .[spellcheck]
 commands =
     codespell --ignore-words=domain-specific-terms.txt src
     codespell --ignore-words=domain-specific-terms.txt README.md
@@ -58,7 +58,7 @@ commands =
 changedir = unittests
 deps =
     {[testenv:tests]deps}
-    -r dev_requirements/requirements-coverage.txt
+    .[coverage]
 setenv = PYTHONPATH = {toxinidir}/src
 commands =
     coverage run -m pytest --basetemp={envtmpdir} {posargs}
@@ -74,7 +74,7 @@ deps =
     {[testenv:type_check]deps}
     {[testenv:coverage]deps}
     {[testenv:spell_check]deps}
-    -r dev_requirements/requirements-formatting.txt
+    .[formatting]
     pip-tools
     pre-commit
 commands =
@@ -86,7 +86,7 @@ commands =
 [testenv:test_packaging]
 skip_install = true
 deps =
-    -r dev_requirements/requirements-packaging.txt
+    .[packaging]
 commands =
     python -m build
     twine check dist/*