Specify test dependencies in requirements.txt files (#1094)

jonathanberthias · Joao-Dionisio · web-flow · commit 765ff641f3e5 · 2025-10-28T23:31:44.000Z
* Specify test dependencies in requirements.txt files * Set SCIP version to 9.2.3 in all workflows * Add workflow_dispatch for integration tests * Trigger integration tests in the fork * Revert "Trigger integration tests in the fork" This reverts commit bef9b10. --------- Co-authored-by: João Dionísio <57299939+Joao-Dionisio@users.noreply.github.com>
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -1,6 +1,6 @@
 name: Run tests with coverage
 env:
-  version: 9.2.1
+  version: 9.2.3
 
 on:
   push:
@@ -25,8 +25,8 @@ jobs:
 
       - name: Install dependencies (SCIPOptSuite)
         run: |
-          wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/$(echo "v${{env.version}}" | tr -d '.')/SCIPOptSuite-${{ env.version }}-Linux-ubuntu20.deb
-          sudo apt-get update && sudo apt install -y ./SCIPOptSuite-${{ env.version }}-Linux-ubuntu20.deb
+          wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/$(echo "v${{env.version}}" | tr -d '.')/SCIPOptSuite-${{ env.version }}-Linux-ubuntu22.deb
+          sudo apt-get update && sudo apt install -y ./SCIPOptSuite-${{ env.version }}-Linux-ubuntu22.deb
 
       - name: Setup python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
@@ -36,7 +36,7 @@ jobs:
       - name: Prepare python environment
         run: |
           python -m pip install --upgrade pip
-          python -m pip install ".[coverage]"
+          python -m pip install -r requirements/coverage.txt
 
       - name: Install PySCIPOpt
         run: |
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -1,7 +1,7 @@
 name: Integration test
 
 env:
-  version: 9.2.0
+  version: 9.2.3
 
 on:
   push:
@@ -17,14 +17,14 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v3
 
       - name: Install dependencies (SCIPOptSuite)
         run: |
-          wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/$(echo "v${{env.version}}" | tr -d '.')/SCIPOptSuite-${{ env.version }}-Linux-ubuntu20.deb
-          sudo apt-get update && sudo apt install -y ./SCIPOptSuite-${{ env.version }}-Linux-ubuntu20.deb
+          wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/$(echo "v${{env.version}}" | tr -d '.')/SCIPOptSuite-${{ env.version }}-Linux-ubuntu22.deb
+          sudo apt-get update && sudo apt install -y ./SCIPOptSuite-${{ env.version }}-Linux-ubuntu22.deb
 
       - name: Setup python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
@@ -34,22 +34,21 @@ jobs:
       - name: Prepare python environment
         run: |
           python -m pip install --upgrade pip
-          python -m pip install ".[test]"
+          python -m pip install -r requirements/test.txt
 
       - name: Install PySCIPOpt
         run: python -m pip install .
 
       - name: Run pyscipopt tests
-        run: |
-          py.test -nauto
+        run: pytest -nauto
 
   Windows-test:
     env:
       SCIPOPTDIR: C:\scipoptdir
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v3
 
@@ -70,7 +69,7 @@ jobs:
         shell: powershell
         run: |
           python -m pip install --upgrade pip
-          python -m pip install ".[test]"
+          python -m pip install -r requirements/test.txt
 
       - name: Install PySCIPOpt
         shell: powershell
@@ -80,14 +79,13 @@ jobs:
 
       - name: Run pyscipopt tests
         shell: powershell
-        run: |
-          py.test -nauto
+        run: pytest -nauto
 
   MacOS-test:
     runs-on: macos-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v3
 
@@ -97,7 +95,7 @@ jobs:
           wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/$(echo "v${{env.version}}" | tr -d '.')/SCIPOptSuite-${{ env.version }}-Darwin.sh
           chmod +x SCIPOptSuite-${{ env.version }}-Darwin.sh
           ./SCIPOptSuite-${{ env.version }}-Darwin.sh --skip-license --include-subdir
-          mv SCIPOptSuite-${{ env.version }}-Darwin ${{ runner.workspace }}/scipoptsuite
+          mv SCIPOptSuite-${{ env.version }}-Darwin ${{ github.workspace }}/scipoptsuite
 
       - name: Setup python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
@@ -107,19 +105,19 @@ jobs:
       - name: Prepare python environment
         run: |
           python -m pip install --upgrade pip
-          python -m pip install ".[test]"
+          python -m pip install -r requirements/test.txt
 
       - name: Install PySCIPOpt
         run: |
-          export SCIPOPTDIR=${{ runner.workspace }}/scipoptsuite/
-          export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${{ runner.workspace }}/scipoptsuite/lib
+          export SCIPOPTDIR=${{ github.workspace }}/scipoptsuite/
+          export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${{ github.workspace }}/scipoptsuite/lib
           python -m pip install .
 
 #      - name: Run pyscipopt tests
 #        run: |
-#          export SCIPOPTDIR=${{ runner.workspace }}/scipoptsuite/
-#          export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${{ runner.workspace }}/scipoptsuite/lib
-#          py.test
+#          export SCIPOPTDIR=${{ github.workspace }}/scipoptsuite/
+#          export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${{ github.workspace }}/scipoptsuite/lib
+#          pytest
 
   ### if you need valgrind on mac, you can install it via
   # brew tap LouisBrunner/valgrind
diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml
@@ -1,7 +1,7 @@
 name: TestPyPI release
 
 env:
-  version: 9.0.0
+  version: 9.2.3
 
 
 # runs only when a release is published, not on drafts
diff --git a/.github/workflows/update-packages-and-documentation.yml b/.github/workflows/update-packages-and-documentation.yml
@@ -1,7 +1,7 @@
 name: Test and Release PyPI Package
 
 env:
-  version: 9.0.0
+  version: 9.2.3
 
 
 # runs only when a release is published, not on drafts
@@ -49,7 +49,7 @@ jobs:
       - name: Prepare python environment
         run: |
           python -m pip install --upgrade pip
-          python -m pip install ".[test]"
+          python -m pip install -r requirements/test.txt
 
       - name: Install PySCIPOpt
         run: python -m pip install .
@@ -86,7 +86,7 @@ jobs:
         shell: powershell
         run: |
           python -m pip install --upgrade pip
-          python -m pip install ".[test]"
+          python -m pip install -r requirements/test.txt
         
       - name: Install PySCIPOpt
         shell: powershell
diff --git a/INSTALL.md b/INSTALL.md
@@ -116,10 +116,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` extra.
+some dependencies which can be installed via pip.
 
-    pip install ".[test]"
+    pip install -r requirements/test.txt
 
 Tests can be run in the `PySCIPOpt` directory with: :
 
diff --git a/docs/build.rst b/docs/build.rst
@@ -178,12 +178,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` extra.
+install some dependencies.
 
 .. code-block:: bash
 
-  pip install ".[test]"
+  pip install -r requirements/test.txt
 
 Tests can be run in the PySCIPOpt directory with the commands:
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,20 +26,6 @@ dynamic = ["version"]
 [project.urls]
 Homepage = "https://github.com/SCIP-Interfaces/PySCIPOpt"
 
-[project.optional-dependencies]
-test = [
-    "pytest",
-    "pytest-xdist",
-    "networkx",  # only needed for a few tests
-]
-coverage = [
-    "pytest",
-    "pytest-xdist",
-    "networkx",
-    "coverage",
-    "cython",
-]
-
 [tool.pytest.ini_options]
 norecursedirs = ["check"]
 testpaths = ["tests"]
diff --git a/requirements/coverage.txt b/requirements/coverage.txt
@@ -0,0 +1,3 @@
+-r ./test.txt
+coverage>=7
+cython>=3
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -0,0 +1,3 @@
+pytest>=8
+pytest-xdist>=3
+networkx>=3  # only needed for a few tests

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-r ./test.txt`
	`2`	`+coverage>=7`
	`3`	`+cython>=3`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+pytest>=8`
	`2`	`+pytest-xdist>=3`
	`3`	`+networkx>=3 # only needed for a few tests`