Merge branch 'master' into ExprLike

Author: Zeroto521

.github/workflows/stubs.yml

@@ -78,6 +78,7 @@ jobs:
       - name: Install Ruff
         uses: astral-sh/ruff-action@v3
         with:
+          version: "0.14.11"
           args: "--version"
 
       - name: Lint type stubs

CHANGELOG.md

@@ -6,20 +6,29 @@
 ### Changed
 ### Removed
 
-## 6.2.0 - 2026.04.23
+## 6.2.1 - 2026.05.16
+### Fixed
+- Fixed `AttributeError` when comparing NumPy scalars (e.g. `np.float64`) or 0-dim NumPy arrays against `Expr`/`Variable` on NumPy 2.x (#1218)
+
+## 6.2.0 - 2026.05.11
 ### Added
+- Added `solveProbingLPWithPricing()` and test
 - `Expr` and `GenExpr` support NumPy unary functions (`np.sin`, `np.cos`, `np.sqrt`, `np.exp`, `np.log`, `np.absolute`, `np.negative`)
 - `Expr` and `GenExpr` support NumPy binary functions (`np.add`, `np.subtract`, `np.multiply`, `np.divide`, `np.true_divide`, `np.power`, `np.less_equal`, `np.greater_equal`, `np.equal`)
 - Added `getBase()` and `setBase()` methods to `LP` class for getting/setting basis status
 - Added `getMemUsed()`, `getMemTotal()`, and `getMemExternEstim()` methods
 - Added `isReoptEnabled()` and raising error if not enabled upon calling `reoptSolve()`
+- SOS1/SOS2 constraints are now realease after addition similar to the other constraint types
 ### Fixed
 - Removed `Py_INCREF`/`Py_DECREF` on `Model` in `catchEvent`/`dropEvent` that caused memory leak for imbalanced usage
 - Used `getIndex()` instead of `ptr()` for sorting nonlinear expression terms to avoid nondeterministic behavior
 - Fixed stubtest failures with mypy 1.20 by marking dunder method parameters as positional-only
 - Return `MatrixGenExpr` in `buildGenExprObj` instead of `MatrixExpr`
-- Plugins now hold strong references to their `Model` instead of `weakref.proxy`, fixing `ReferenceError` during cleanup callbacks (#1193)
+- Plugins now hold strong references to their `Model` instead of `weakref.proxy`, fixing `ReferenceError` during cleanup callbacks
+- Made `test_tree` robust to SCIP solver improvements by asserting visited node depths instead of node count
+- Lower macOS wheel `MACOSX_DEPLOYMENT_TARGET` to 11.0 and patch bundled SCIP/SoPlex/GCG and GCC runtime dylibs to match
 ### Changed
+- Return NotImplemented for `Expr` and `GenExpr` operators if they can't handle input types in the calculation
 - Speed up `constant * Expr` via C-level API
 - Speed up `Term.__eq__` via the C-level API
 - Move magic methods (`__radd__`, `__sub__`, `__rsub__`, `__rmul__`, `__richcmp__`, `__neg__`, and `__rtruediv__`) to `ExprLike` base class

RELEASE.md

@@ -70,3 +70,23 @@ Deletes the release-candidate branch and resets the local release commit. test-p
   gh release create vX.Y.Z --repo scipopt/PySCIPOpt --title vX.Y.Z --generate-notes
   ```
 - [ ] Update readthedocs: Builds -> Build version (latest and stable)
+
+## Manual release (fallback)
+The following are the steps to follow to make a new PySCIPOpt release. They should mostly be done in order. 
+- [ ] Check if [scipoptsuite-deploy](https://github.com/scipopt/scipoptsuite-deploy) needs a new release, if a new SCIP version is released for example, or new dependencies (change symmetry dependency, add support for papilo/ parallelization.. etc). And Update release links in `pyproject.toml`
+- [ ] Check if the table in the [documentation](https://pyscipopt.readthedocs.io/en/latest/build.html#building-from-source) needs to be updated. 
+- [ ] Update version number according to semantic versioning [rules](https://semver.org/) in `src/pyscipopt/_version.py` and `setup.py`
+- [ ] Update `CHANGELOG.md`; Change the `Unreleased` to the new version number and add an empty unreleased section.
+- [ ] Create a release candidate on test-pypi by running the workflow “Build wheels” in Actions->build wheels, with these parameters `upload:true, test-pypi:true` 
+- [ ] If the pipeline passes, test the released pip package on test-pypi by running and checking that it works
+```bash
+pip install -i https://test.pypi.org/simple/ PySCIPOpt
+```
+- [ ] If it works, release on pypi.org with running the same workflow but with `test-pypi:false`.
+- [ ] Then create a tag with the new version (from the master branch)
+```bash
+git tag vX.X.X
+git push origin vX.X.X
+```
+- [ ] Then make a github [release](https://github.com/scipopt/PySCIPOpt/releases/new) from this new tag. 
+- [ ] Update the documentation: from readthedocs.io -> Builds -> Build version (latest and stable)

pyproject.toml

@@ -64,28 +64,36 @@ skip="pp* cp36* cp37*"
 before-all = '''
 #!/bin/bash
 brew install wget zlib gcc
+export MACOSX_DEPLOYMENT_TARGET=11.0
 if [[ $CIBW_ARCHS == *"arm"* ]]; then
     wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.12.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.12.0/libscip-macos-intel.zip -O scip.zip
-    export MACOSX_DEPLOYMENT_TARGET=14.0
 fi
 unzip scip.zip
 mv scip_install src/scip
+# The bundled SCIP/SoPlex/GCG dylibs are stamped with LC_BUILD_VERSION 14.0 and
+# Homebrew gcc runtime libs on macos-15 runners with 15.0. delocate refuses to
+# bundle libs whose minos exceeds the wheel's deployment target. Rewrite the
+# load command to MACOSX_DEPLOYMENT_TARGET; these libs do not use OS-version-
+# gated APIs, so the rewrite is safe in practice.
+find src/scip/lib -type f -name "*.dylib" 2>/dev/null | while read lib; do
+    vtool -set-build-version macos "$MACOSX_DEPLOYMENT_TARGET" "$MACOSX_DEPLOYMENT_TARGET" -replace -output "$lib" "$lib" 2>/dev/null || true
+    codesign --force --sign - "$lib" 2>/dev/null || true
+done
+for prefix in /usr/local /opt/homebrew; do
+    find "$prefix/Cellar" -type f \( -name "libgfortran.*.dylib" -o -name "libquadmath.*.dylib" -o -name "libstdc++.*.dylib" -o -name "libgcc_s.*.dylib" \) 2>/dev/null | while read lib; do
+        vtool -set-build-version macos "$MACOSX_DEPLOYMENT_TARGET" "$MACOSX_DEPLOYMENT_TARGET" -replace -output "$lib" "$lib" 2>/dev/null || true
+        codesign --force --sign - "$lib" 2>/dev/null || true
+    done
+done
 '''
-environment = {SCIPOPTDIR="$(pwd)/src/scip", LD_LIBRARY_PATH="$(pwd)/src/scip/lib:LD_LIBRARY_PATH", DYLD_LIBRARY_PATH="$(pwd)/src/scip/lib:$DYLD_LIBRARY_PATH", PATH="$(pwd)/src/scip/bin:$PATH", PKG_CONFIG_PATH="$(pwd)/src/scip/lib/pkgconfig:$PKG_CONFIG_PATH", RELEASE="true"}
+environment = {SCIPOPTDIR="$(pwd)/src/scip", LD_LIBRARY_PATH="$(pwd)/src/scip/lib:LD_LIBRARY_PATH", DYLD_LIBRARY_PATH="$(pwd)/src/scip/lib:$DYLD_LIBRARY_PATH", PATH="$(pwd)/src/scip/bin:$PATH", PKG_CONFIG_PATH="$(pwd)/src/scip/lib/pkgconfig:$PKG_CONFIG_PATH", MACOSX_DEPLOYMENT_TARGET="11.0", RELEASE="true"}
 repair-wheel-command = '''
     bash -c '
-    if [[ $CIBW_ARCHS == *"arm"* ]]; then
-        export MACOSX_DEPLOYMENT_TARGET=14.0
-        delocate-listdeps {wheel}
-        delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
-    else
-        export MACOSX_DEPLOYMENT_TARGET=14.0
-        delocate-listdeps {wheel}
-        delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
-    fi
+    export MACOSX_DEPLOYMENT_TARGET=11.0
+    delocate-listdeps {wheel}
+    delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
     '
 '''
 

setup.py

@@ -133,7 +133,7 @@
 
 setup(
     name="PySCIPOpt",
-    version="6.2.0",
+    version="6.2.1",
     description="Python interface and modeling environment for SCIP",
     long_description=long_description,
     long_description_content_type="text/markdown",

src/pyscipopt/_version.py

@@ -1 +1 @@
-__version__: str = '6.2.0'
+__version__: str = '6.2.1'