Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Run tests with coverage
env:
version: 9.2.3
version: 9.2.4

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Integration test

env:
version: 9.2.3
version: 9.2.4

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-release.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-packages-and-documentation.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## Unreleased
### Added
### Fixed
### Changed
### Removed

## 5.6.0 - 2025.11.01
### 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.
Expand Down
2 changes: 1 addition & 1 deletion docs/build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/pyscipopt/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__: str = '5.6.0'
__version__: str = '5.7.0'
2 changes: 1 addition & 1 deletion src/pyscipopt/scip.pxi
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
# 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
Expand Down Expand Up @@ -308,7 +308,7 @@
if rc == SCIP_OKAY:
pass
elif rc == SCIP_ERROR:
raise Exception('SCIP: unspecified error!')

Check failure on line 311 in src/pyscipopt/scip.pxi

View workflow job for this annotation

GitHub Actions / test-coverage (3.11)

SCIP: unspecified error!
elif rc == SCIP_NOMEMORY:
raise MemoryError('SCIP: insufficient memory error!')
elif rc == SCIP_READERROR:
Expand Down
4 changes: 1 addition & 3 deletions tests/test_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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()

Expand Down
3 changes: 2 additions & 1 deletion tests/test_relax.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading