Use optional dependencies instead of dependency groups (#1093)

* Use optional dependencies instead of dependency groups

* Fix release pipeline

* Force run integration tests

* Revert "Force run integration tests"

This reverts commit 42ead97.

Author: jonathanberthias

.github/workflows/coverage.yml

@@ -36,11 +36,7 @@ jobs:
       - name: Prepare python environment
         run: |
           python -m pip install --upgrade pip
-          if python -m pip help install | grep -q -- '--group'; then
-            python -m pip install --group coverage
-          else
-            python -m pip install networkx cython pytest-cov numpy
-          fi
+          python -m pip install ".[coverage]"
 
       - name: Install PySCIPOpt
         run: |
@@ -51,15 +47,11 @@ jobs:
       - name: Run pyscipopt tests
         run: |
           sudo apt-get install tzdata locales -y && sudo locale-gen pt_PT && sudo update-locale # add pt_PT locale that is used in tests
-          if python -m pip help install | grep -q -- '--group'; then
-            coverage run -m pytest -nauto
-            coverage combine
-          else
-            coverage run -m pytest
-          fi
+          coverage run -m pytest -nauto
+          coverage combine
           coverage report -m
           coverage xml
-      
+
       - name: Upload to codecov.io
         uses: codecov/codecov-action@v2
         with:

.github/workflows/integration-test.yml

@@ -3,7 +3,6 @@ name: Integration test
 env:
   version: 9.2.0
 
-# runs on branches and pull requests; doesn't run on tags.
 on:
   push:
     branches:
@@ -34,22 +33,14 @@ jobs:
       - name: Prepare python environment
         run: |
           python -m pip install --upgrade pip
-          if python -m pip help install | grep -q -- '--group'; then
-            python -m pip install --group test-full
-          else
-            python -m pip install networkx pytest-cov numpy
-          fi
+          python -m pip install ".[test]"
 
       - name: Install PySCIPOpt
         run: python -m pip install .
 
       - name: Run pyscipopt tests
         run: |
-          if python -m pip help install | grep -q -- '--group'; then
-            py.test -nauto
-          else
-            py.test
-          fi
+          py.test -nauto
 
   Windows-test:
     env:
@@ -77,13 +68,8 @@ jobs:
       - name: Prepare python environment
         shell: powershell
         run: |
-          $pipHelp = python -m pip help install
-          if ($pipHelp -match '--group') {
-            python -m pip install --group test-full
-          }
-          else {
-            python -m pip install wheel cython networkx pytest-cov
-          }
+          python -m pip install --upgrade pip
+          python -m pip install ".[test]"
 
       - name: Install PySCIPOpt
         shell: powershell
@@ -94,12 +80,7 @@ jobs:
       - name: Run pyscipopt tests
         shell: powershell
         run: |
-          $pipHelp = python -m pip help install
-          if ($pipHelp -match '--group') {
-            py.test -nauto
-          } else {
-            py.test
-          }
+          py.test -nauto
 
   MacOS-test:
     runs-on: macos-latest
@@ -125,11 +106,7 @@ jobs:
       - name: Prepare python environment
         run: |
           python -m pip install --upgrade pip
-          if python -m pip help install | grep -q -- '--group'; then
-            python -m pip install --group test-full
-          else
-            python -m pip install networkx pytest-cov pytest numpy
-          fi
+          python -m pip install ".[test]"
 
       - name: Install PySCIPOpt
         run: |

.github/workflows/update-packages-and-documentation.yml

@@ -49,22 +49,14 @@ jobs:
       - name: Prepare python environment
         run: |
           python -m pip install --upgrade pip
-          if python -m pip help install | grep -q -- '--group'; then
-            python -m pip install --group test-full
-          else
-            python -m pip install wheel cython networkx pytest-cov
-          fi
+          python -m pip install ".[test]"
 
       - name: Install PySCIPOpt
         run: python -m pip install .
 
       - name: Run pyscipopt tests
         run: |
-          if python -m pip help install | grep -q -- '--group'; then
-            py.test -nauto
-          else
-            py.test
-          fi
+          py.test -nauto
 
   windows-test:
     needs: release-integration-test
@@ -94,11 +86,8 @@ jobs:
         shell: powershell
         run: |
           python -m pip install --upgrade pip
-          if python -m pip help install | grep -q -- '--group'; then
-            python -m pip install --group test-full
-          else
-            python -m pip install wheel cython networkx pytest-cov
-          fi
+          python -m pip install ".[test]"
+        
       - name: Install PySCIPOpt
         shell: powershell
         run: |
@@ -107,15 +96,11 @@ jobs:
       - name: Run pyscipopt tests
         shell: powershell
         run: |
-          if python -m pip help install | grep -q -- '--group'; then
-            py.test -nauto
-          else
-            py.test
-          fi
+          py.test -nauto
 
 
   deploy-packages-and-generate-documentation:
-    needs: Windows-test
+    needs: windows-test
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
@@ -150,4 +135,4 @@ jobs:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
           verbose: true
-          packages_dir: dist/
+          packages_dir: dist/

CHANGELOG.md

@@ -8,7 +8,7 @@
 - Implemented all binary operations between MatrixExpr and GenExpr
 - Fixed the type of @ matrix operation result from MatrixVariable to MatrixExpr.
 ### Changed
-- Add a PEP 735 dependency group for test dependencies in `pyproject.toml`
+- Add package extras for test dependencies in `pyproject.toml`
 - Speed up MatrixVariable.sum(axis=None) via quicksum
 - MatrixVariable now supports comparison with Expr
 ### Removed

INSTALL.md

@@ -117,9 +117,9 @@ Testing new installation
 
 To test your brand-new installation of PySCIPOpt you need
 some dependencies which can be installed via pip. The testing
-dependencies are in the `test` dependency group.
+dependencies are in the `test` extra.
 
-    pip install --group test
+    pip install ".[test]"
 
 Tests can be run in the `PySCIPOpt` directory with: :
 

docs/build.rst

@@ -179,11 +179,11 @@ Testing the Installation
 
 To test your brand-new installation of PySCIPOpt you need to
 install some dependencies via pip. The testing dependencies are in
-the `test` dependency group.
+the `test` extra.
 
 .. code-block:: bash
 
-  pip install --group test
+  pip install ".[test]"
 
 Tests can be run in the PySCIPOpt directory with the commands:
 

pyproject.toml

@@ -26,17 +26,16 @@ dynamic = ["version"]
 [project.urls]
 Homepage = "https://github.com/SCIP-Interfaces/PySCIPOpt"
 
-[dependency-groups]
+[project.optional-dependencies]
 test = [
     "pytest",
     "pytest-xdist",
-]
-test-full = [
-    {"include-group" = "test" },
     "networkx",  # only needed for a few tests
 ]
 coverage = [
-    { "include-group" = "test-full" },
+    "pytest",
+    "pytest-xdist",
+    "networkx",
     "coverage",
     "cython",
 ]