From 44d77fb53efce976da6e1b1b62fad17bf0805049 Mon Sep 17 00:00:00 2001 From: Mohammed Ghannam Date: Thu, 9 Oct 2025 12:07:58 +0200 Subject: [PATCH 1/2] Add back lost v5.6.0 changes --- CHANGELOG.md | 6 ++++++ pyproject.toml | 27 ++++++++++++++++++--------- setup.py | 5 +++-- src/pyscipopt/_version.py | 2 +- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index addf21992..0dc835b3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## Unreleased ### Added +### Fixed +### Changed +### Removed + +## v5.6.0 - 2025.08.26 +### Added - More support for AND-Constraints - Added support for knapsack constraints - Added isPositive(), isNegative(), isFeasLE(), isFeasLT(), isFeasGE(), isFeasGT(), isHugeValue(), and tests diff --git a/pyproject.toml b/pyproject.toml index bd72e9806..3782ea892 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,16 +39,25 @@ version = {attr = "pyscipopt._version.__version__"} [tool.cibuildwheel] skip="pp*" # currently doesn't work with PyPy manylinux-x86_64-image = "manylinux_2_28" +manylinux-aarch64-image = "manylinux_2_28" [tool.cibuildwheel.linux] skip="pp* cp36* cp37* *musllinux*" -before-all = [ - "(apt-get update && apt-get install --yes wget) || yum install -y wget zlib libgfortran || brew install wget", - "wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.7.0/libscip-linux.zip -O scip.zip", - "unzip scip.zip", - "mv scip_install scip" - ] +before-all = ''' +#!/bin/bash +(apt-get update && apt-get install --yes wget) || yum install -y wget zlib libgfortran || brew install wget +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 +else + wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-linux.zip -O scip.zip +fi +unzip scip.zip +mv scip_install scip +''' environment = { SCIPOPTDIR="$(pwd)/scip", LD_LIBRARY_PATH="$(pwd)/scip/lib:$LD_LIBRARY_PATH", DYLD_LIBRARY_PATH="$(pwd)/scip/lib:$DYLD_LIBRARY_PATH", PATH="$(pwd)/scip/bin:$PATH", PKG_CONFIG_PATH="$(pwd)/scip/lib/pkgconfig:$PKG_CONFIG_PATH", RELEASE="true"} @@ -58,10 +67,10 @@ before-all = ''' #!/bin/bash brew install wget zlib gcc if [[ $CIBW_ARCHS == *"arm"* ]]; then - wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.7.0/libscip-macos-arm.zip -O scip.zip + wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.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.7.0/libscip-macos-intel.zip -O scip.zip + 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 fi unzip scip.zip @@ -87,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.7.0/libscip-windows.zip -O scip.zip", + "wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.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 b9f9f1991..f1f5f48d2 100644 --- a/setup.py +++ b/setup.py @@ -62,8 +62,9 @@ extra_link_args.append(f"-Wl,-rpath,{libdir}") # enable debug mode if requested -if os.environ.get("PYSCIPOPT_DEBUG")=="True": +if "--debug" in sys.argv: extra_compile_args.append("-UNDEBUG") + sys.argv.remove("--debug") use_cython = True @@ -109,7 +110,7 @@ setup( name="PySCIPOpt", - version="5.5.0", + version="5.6.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 6b20b2b7e..d5eb5a19a 100644 --- a/src/pyscipopt/_version.py +++ b/src/pyscipopt/_version.py @@ -1 +1 @@ -__version__: str = '5.5.0' +__version__ = '5.6.0' From 6c3046173c31ac364ab8f14a0f4acea5225222fc Mon Sep 17 00:00:00 2001 From: Mohammed Ghannam Date: Thu, 9 Oct 2025 12:09:26 +0200 Subject: [PATCH 2/2] Add back type declaration --- src/pyscipopt/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pyscipopt/_version.py b/src/pyscipopt/_version.py index d5eb5a19a..5f9eca310 100644 --- a/src/pyscipopt/_version.py +++ b/src/pyscipopt/_version.py @@ -1 +1 @@ -__version__ = '5.6.0' +__version__: str = '5.6.0'