Skip to content

Commit 0c58aaf

Browse files
authored
Merge pull request #1080 from scipopt/lost-v560-changes
Add back lost v5.6.0 changes
2 parents 04af6e8 + 6c30461 commit 0c58aaf

File tree

4 files changed

+28
-12
lines changed

4 files changed

+28
-12
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## Unreleased
44
### Added
5+
### Fixed
6+
### Changed
7+
### Removed
8+
9+
## v5.6.0 - 2025.08.26
10+
### Added
511
- More support for AND-Constraints
612
- Added support for knapsack constraints
713
- Added isPositive(), isNegative(), isFeasLE(), isFeasLT(), isFeasGE(), isFeasGT(), isHugeValue(), and tests

pyproject.toml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,25 @@ version = {attr = "pyscipopt._version.__version__"}
3939
[tool.cibuildwheel]
4040
skip="pp*" # currently doesn't work with PyPy
4141
manylinux-x86_64-image = "manylinux_2_28"
42+
manylinux-aarch64-image = "manylinux_2_28"
4243

4344

4445
[tool.cibuildwheel.linux]
4546
skip="pp* cp36* cp37* *musllinux*"
46-
before-all = [
47-
"(apt-get update && apt-get install --yes wget) || yum install -y wget zlib libgfortran || brew install wget",
48-
"wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.7.0/libscip-linux.zip -O scip.zip",
49-
"unzip scip.zip",
50-
"mv scip_install scip"
51-
]
47+
before-all = '''
48+
#!/bin/bash
49+
(apt-get update && apt-get install --yes wget) || yum install -y wget zlib libgfortran || brew install wget
50+
AARCH=$(uname -m)
51+
echo "------"
52+
echo $AARCH
53+
if [[ $AARCH == "aarch64" ]]; then
54+
wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-linux-arm.zip -O scip.zip
55+
else
56+
wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-linux.zip -O scip.zip
57+
fi
58+
unzip scip.zip
59+
mv scip_install scip
60+
'''
5261
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"}
5362

5463

@@ -58,10 +67,10 @@ before-all = '''
5867
#!/bin/bash
5968
brew install wget zlib gcc
6069
if [[ $CIBW_ARCHS == *"arm"* ]]; then
61-
wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.7.0/libscip-macos-arm.zip -O scip.zip
70+
wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-macos-arm.zip -O scip.zip
6271
export MACOSX_DEPLOYMENT_TARGET=14.0
6372
else
64-
wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.7.0/libscip-macos-intel.zip -O scip.zip
73+
wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-macos-intel.zip -O scip.zip
6574
export MACOSX_DEPLOYMENT_TARGET=13.0
6675
fi
6776
unzip scip.zip
@@ -87,7 +96,7 @@ repair-wheel-command = '''
8796
skip="pp* cp36* cp37*"
8897
before-all = [
8998
"choco install 7zip wget",
90-
"wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.7.0/libscip-windows.zip -O scip.zip",
99+
"wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-windows.zip -O scip.zip",
91100
"\"C:\\Program Files\\7-Zip\\7z.exe\" x \"scip.zip\" -o\"scip-test\"",
92101
"mv .\\scip-test\\scip_install .\\test",
93102
"mv .\\test .\\scip"

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@
6262
extra_link_args.append(f"-Wl,-rpath,{libdir}")
6363

6464
# enable debug mode if requested
65-
if os.environ.get("PYSCIPOPT_DEBUG")=="True":
65+
if "--debug" in sys.argv:
6666
extra_compile_args.append("-UNDEBUG")
67+
sys.argv.remove("--debug")
6768

6869
use_cython = True
6970

@@ -109,7 +110,7 @@
109110

110111
setup(
111112
name="PySCIPOpt",
112-
version="5.5.0",
113+
version="5.6.0",
113114
description="Python interface and modeling environment for SCIP",
114115
long_description=long_description,
115116
long_description_content_type="text/markdown",

src/pyscipopt/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__: str = '5.5.0'
1+
__version__: str = '5.6.0'

0 commit comments

Comments
 (0)