diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index b3cf96bb7..bcb30cb14 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -1,6 +1,6 @@ name: Run tests with coverage env: - version: 9.2.3 + version: 9.2.4 on: push: diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 0a58eec27..e374983e4 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -1,7 +1,7 @@ name: Integration test env: - version: 9.2.3 + version: 9.2.4 on: push: diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml index b42b12b47..89c880a29 100644 --- a/.github/workflows/test-release.yml +++ b/.github/workflows/test-release.yml @@ -1,7 +1,7 @@ name: TestPyPI release env: - version: 9.2.3 + version: 9.2.4 # 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 index 8cc9f0dcf..402321635 100644 --- 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.2.3 + version: 9.2.4 # runs only when a release is published, not on drafts diff --git a/CHANGELOG.md b/CHANGELOG.md index 1338f8c03..cddd24531 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## Unreleased ### Added +### Fixed +### Changed +### Removed + +## 5.7.0 - 2025.11.17 +### Added - Added possibility of having variables in exponent. - Added basic type stubs to help with IDE autocompletion and type checking. - MatrixVariable comparisons (<=, >=, ==) now support numpy's broadcast feature. diff --git a/docs/build.rst b/docs/build.rst index 4f9e39fde..5c377d9b9 100644 --- a/docs/build.rst +++ b/docs/build.rst @@ -22,7 +22,7 @@ To download SCIP please either use the pre-built SCIP Optimization Suite availab * - SCIP - PySCIPOpt * - 9.2 - - 5.3, 5.4+ + - 5.3, 5.4, 5.5, 5.6, 5.7 * - 9.1 - 5.1, 5.2.x * - 9.0 diff --git a/pyproject.toml b/pyproject.toml index 3782ea892..cd57229c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,9 +51,9 @@ AARCH=$(uname -m) echo "------" echo $AARCH if [[ $AARCH == "aarch64" ]]; then - wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-linux-arm.zip -O scip.zip + wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.9.0/libscip-linux-arm.zip -O scip.zip else - wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-linux.zip -O scip.zip + wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.9.0/libscip-linux.zip -O scip.zip fi unzip scip.zip mv scip_install scip @@ -67,11 +67,11 @@ before-all = ''' #!/bin/bash brew install wget zlib gcc if [[ $CIBW_ARCHS == *"arm"* ]]; then - wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-macos-arm.zip -O scip.zip + wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.9.0/libscip-macos-arm.zip -O scip.zip export MACOSX_DEPLOYMENT_TARGET=14.0 else - wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-macos-intel.zip -O scip.zip - export MACOSX_DEPLOYMENT_TARGET=13.0 + wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.9.0/libscip-macos-intel.zip -O scip.zip + export MACOSX_DEPLOYMENT_TARGET=14.0 fi unzip scip.zip mv scip_install src/scip @@ -84,7 +84,7 @@ repair-wheel-command = ''' delocate-listdeps {wheel} delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel} else - export MACOSX_DEPLOYMENT_TARGET=13.0 + export MACOSX_DEPLOYMENT_TARGET=14.0 delocate-listdeps {wheel} delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel} fi @@ -96,7 +96,7 @@ repair-wheel-command = ''' skip="pp* cp36* cp37*" before-all = [ "choco install 7zip wget", - "wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-windows.zip -O scip.zip", + "wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.9.0/libscip-windows.zip -O scip.zip", "\"C:\\Program Files\\7-Zip\\7z.exe\" x \"scip.zip\" -o\"scip-test\"", "mv .\\scip-test\\scip_install .\\test", "mv .\\test .\\scip" diff --git a/setup.py b/setup.py index e121c480b..fd7c7f42a 100644 --- a/setup.py +++ b/setup.py @@ -118,7 +118,7 @@ setup( name="PySCIPOpt", - version="5.6.0", + version="5.7.0", description="Python interface and modeling environment for SCIP", long_description=long_description, long_description_content_type="text/markdown", diff --git a/src/pyscipopt/_version.py b/src/pyscipopt/_version.py index 5f9eca310..436352739 100644 --- a/src/pyscipopt/_version.py +++ b/src/pyscipopt/_version.py @@ -1 +1 @@ -__version__: str = '5.6.0' +__version__: str = '5.7.0' diff --git a/src/pyscipopt/scip.pxi b/src/pyscipopt/scip.pxi index 0a278ecb5..648bf858a 100644 --- a/src/pyscipopt/scip.pxi +++ b/src/pyscipopt/scip.pxi @@ -43,7 +43,7 @@ include "matrix.pxi" # recommended SCIP version; major version is required MAJOR = 9 MINOR = 2 -PATCH = 1 +PATCH = 4 # for external user functions use def; for functions used only inside the interface (starting with _) use cdef # todo: check whether this is currently done like this diff --git a/tests/test_model.py b/tests/test_model.py index 391b21c41..0a6a0f71d 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -148,7 +148,6 @@ def test_multiple_cons_names(): assert conss == m.getConss() assert m.getNConss() == 5 - def test_multiple_cons_params(): """Test if setting the remaining parameters works as expected""" def assert_conss_neq(a, b): @@ -302,8 +301,7 @@ def test_getObjective(): m.addVar(obj=3, name="x2") assert str(m.getObjective()) == "Expr({Term(x1): 2.0, Term(x2): 3.0})" - - + def test_getTreesizeEstimation(): m = Model() diff --git a/tests/test_relax.py b/tests/test_relax.py index 400e4ec0d..3ae38674c 100644 --- a/tests/test_relax.py +++ b/tests/test_relax.py @@ -62,7 +62,8 @@ def test_empty_relaxator(): m.setObjective(x1 + x0) with pytest.raises(Exception): - m.optimize() + with pytest.raises(AssertionError): + m.optimize() def test_relax(): model = random_mip_1()