[rpms/python-pyscipopt] rawhide: Fix `test_markDoNotAggrVar_and_getStatus`

[rpms/python-pyscipopt] rawhide: Fix `test_markDoNotAggrVar_and_getStatus`

[Benjamin A. Beasley]

A new commit has been pushed.

Repo   : rpms/python-pyscipopt
Branch : rawhide
Commit : 44b305e28b86fa562c8f5aee375ad3bb68ac02f1
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-07-18T09:21:51+01:00
Stats  : +76/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/python-pyscipopt/c/44b305e28b86fa562c8f5aee375ad3bb68ac02f1?branch=rawhide

Log:
Fix `test_markDoNotAggrVar_and_getStatus`

---
diff --git a/0001-Make-test_markDoNotAggrVar_and_getStatus-robust-to-S.patch b/0001-Make-test_markDoNotAggrVar_and_getStatus-robust-to-S.patch
new file mode 100644
index 0000000..2c736af
--- /dev/null
+++ b/0001-Make-test_markDoNotAggrVar_and_getStatus-robust-to-S.patch
@@ -0,0 +1,71 @@
+From f84585d4c4cb321da2bb5cde567bc5e433b8e848 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jo=C3=A3o=20Dion=C3=ADsio?=
+ <57299939+Joao-Dionisio@users.noreply.github.com>
+Date: Thu, 25 Jun 2026 17:47:34 +0100
+Subject: [PATCH] Make test_markDoNotAggrVar_and_getStatus robust to SCIP
+ presolve changes (#1230)
+
+---
+ CHANGELOG.md       |  1 +
+ tests/test_vars.py | 25 +++++++++++--------------
+ 2 files changed, 12 insertions(+), 14 deletions(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index 00173c5..47768b0 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -3,6 +3,7 @@
+ ## Unreleased
+ ### Added
+ ### Fixed
++- Made `test_markDoNotAggrVar_and_getStatus` robust to SCIP presolve changes by discovering the aggregated/multi-aggregated variables instead of hardcoding them
+ ### Changed
+ ### Removed
+ 
+diff --git a/tests/test_vars.py b/tests/test_vars.py
+index 43f7158..b32acfd 100644
+--- a/tests/test_vars.py
++++ b/tests/test_vars.py
+@@ -142,28 +142,25 @@ def test_markDoNotAggrVar_and_getStatus():
+     model.addCons(y - 2*x == 0)
+     model.addCons(x + z + w == 10)
+     model.addCons(x*y*z >= 21) # to prevent presolve from removing all variables
+-    model.presolve()
+ 
+-    assert z.getStatus() == "ORIGINAL"
+-    assert model.getTransformedVar(z).getStatus() == "AGGREGATED"
+-    assert model.getTransformedVar(w).getStatus() == "MULTAGGR"
++    variables = (x, y, z, w)
++    model.presolve()
+ 
+-    assert model.getNVars(True) == 1
++    multaggr = [v for v in variables if model.getTransformedVar(v).getStatus() == "MULTAGGR"]
++    aggregated = [v for v in variables if model.getTransformedVar(v).getStatus() == "AGGREGATED"]
++    assert multaggr, "presolve no longer multi-aggregates; update the test model"
++    assert aggregated, "presolve no longer aggregates; update the test model"
++    assert multaggr[0].getStatus() == "ORIGINAL"
+ 
+     model.freeTransform()
+-    model.markDoNotMultaggrVar(w)
++    model.markDoNotMultaggrVar(multaggr[0])
+     model.presolve()
+-
+-    assert model.getTransformedVar(w).getStatus() != "MULTAGGR"
+-    assert model.getNVars(True) == 3
++    assert model.getTransformedVar(multaggr[0]).getStatus() != "MULTAGGR"
+ 
+     model.freeTransform()
+-    model.markDoNotAggrVar(y)
++    model.markDoNotAggrVar(aggregated[0])
+     model.presolve()
+-    assert model.getTransformedVar(z).getStatus() != "AGGREGATED"
+-    assert model.getNVars(True) == 4
+-
+-    assert x.getStatus() == "ORIGINAL"
++    assert model.getTransformedVar(aggregated[0]).getStatus() != "AGGREGATED"
+ 
+ 
+ def test_isIntegral():
+-- 
+2.55.0
+

diff --git a/python-pyscipopt.spec b/python-pyscipopt.spec
index fb0234d..7a8c659 100644
--- a/python-pyscipopt.spec
+++ b/python-pyscipopt.spec
@@ -10,6 +10,11 @@ License:        MIT AND WTFNMFPL
 URL:            https://github.com/scipopt/PySCIPOpt
 Source:         %{url}/archive/v%{version}/PySCIPOpt-%{version}.tar.gz
 
+# Fix `test_markDoNotAggrVar_and_getStatus`
+# https://github.com/scipopt/PySCIPOpt/pull/1230
+# Cherry-picked on v6.2.1
+Patch:          0001-Make-test_markDoNotAggrVar_and_getStatus-robust-to-S.patch
+
 BuildSystem:    pyproject
 BuildOption(install): --assert-license pyscipopt