PySCIPOpt 4.4.0__tar.gz → 5.0.1__tar.gz

{PySCIPOpt-4.4.0 → pyscipopt-5.0.1}/PKG-INFO

@@ -1,18 +1,20 @@
 Metadata-Version: 2.1
 Name: PySCIPOpt
-Version: 4.4.0
+Version: 5.0.1
 Summary: Python interface and modeling environment for SCIP
 Home-page: https://github.com/SCIP-Interfaces/PySCIPOpt
 Author: Zuse Institute Berlin
-Author-email: scip@zib.de
+Author-email: Zuse Institute Berlin <scip@zib.de>
 License: MIT
+Project-URL: Homepage, https://github.com/SCIP-Interfaces/PySCIPOpt
 Classifier: Development Status :: 4 - Beta
-Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Cython
+Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Mathematics
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
@@ -33,7 +35,7 @@ Documentation
 
 Please consult the [online documentation](https://scipopt.github.io/PySCIPOpt/docs/html) or use the `help()` function directly in Python or `?` in IPython/Jupyter.
 
-See [CHANGELOG.md](CHANGELOG.md) for added, removed or fixed functionality.
+See [CHANGELOG.md](https://github.com/scipopt/PySCIPOpt/blob/master/CHANGELOG.md) for added, removed or fixed functionality.
 
 Installation
 ------------
@@ -52,12 +54,13 @@ conda install --channel conda-forge pyscipopt
 
 **Using PyPI and from Source**
 
-See [INSTALL.md](INSTALL.md) for instructions.
+See [INSTALL.md](https://github.com/scipopt/PySCIPOpt/blob/master/INSTALL.md) for instructions.
 Please note that the latest PySCIPOpt version is usually only compatible with the latest major release of the SCIP Optimization Suite.
 The following table summarizes which version of PySCIPOpt is required for a given SCIP version:
 
 |SCIP| PySCIPOpt |
 |----|----|
+9.0 | 5.x
 8.0 | 4.x
 7.0 | 3.x
 6.0 | 2.x
@@ -65,14 +68,14 @@ The following table summarizes which version of PySCIPOpt is required for a give
 4.0 | 1.2, 1.1
 3.2 | 1.0
 
-Information which version of PySCIPOpt is required for a given SCIP version can also be found in [INSTALL.md](INSTALL.md).
+Information which version of PySCIPOpt is required for a given SCIP version can also be found in [INSTALL.md](https://github.com/scipopt/PySCIPOpt/blob/master/INSTALL.md).
 
 Building and solving a model
 ----------------------------
 
-There are several [examples](examples/finished) and
-[tutorials](examples/tutorial). These display some functionality of the
-interface and can serve as an entry point for writing more complex code.
+There are several [examples](https://github.com/scipopt/PySCIPOpt/blob/master/examples/finished) and
+[tutorials](https://github.com/scipopt/PySCIPOpt/blob/master/examples/tutorial). These display some functionality of the
+interface and can serve as an entry point for writing more complex code. Some of the common usecases are also available in the [recipes](https://github.com/scipopt/PySCIPOpt/blob/master/src/pyscipopt/recipes) sub-package.
 You might also want to have a look at this article about PySCIPOpt:
 <https://opus4.kobv.de/opus4-zib/frontdoor/index/index/docId/6045>. The
 following steps are always required when using the interface:
@@ -146,7 +149,7 @@ functionality you require.
 We are always happy to accept pull request containing patches or
 extensions!
 
-Please have a look at our [contribution guidelines](CONTRIBUTING.md).
+Please have a look at our [contribution guidelines](https://github.com/scipopt/PySCIPOpt/blob/master/CONTRIBUTING.md).
 
 Gotchas
 -------

{PySCIPOpt-4.4.0 → pyscipopt-5.0.1}/PySCIPOpt.egg-info/PKG-INFO

@@ -1,18 +1,20 @@
 Metadata-Version: 2.1
 Name: PySCIPOpt
-Version: 4.4.0
+Version: 5.0.1
 Summary: Python interface and modeling environment for SCIP
 Home-page: https://github.com/SCIP-Interfaces/PySCIPOpt
 Author: Zuse Institute Berlin
-Author-email: scip@zib.de
+Author-email: Zuse Institute Berlin <scip@zib.de>
 License: MIT
+Project-URL: Homepage, https://github.com/SCIP-Interfaces/PySCIPOpt
 Classifier: Development Status :: 4 - Beta
-Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Cython
+Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Mathematics
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
@@ -33,7 +35,7 @@ Documentation
 
 Please consult the [online documentation](https://scipopt.github.io/PySCIPOpt/docs/html) or use the `help()` function directly in Python or `?` in IPython/Jupyter.
 
-See [CHANGELOG.md](CHANGELOG.md) for added, removed or fixed functionality.
+See [CHANGELOG.md](https://github.com/scipopt/PySCIPOpt/blob/master/CHANGELOG.md) for added, removed or fixed functionality.
 
 Installation
 ------------
@@ -52,12 +54,13 @@ conda install --channel conda-forge pyscipopt
 
 **Using PyPI and from Source**
 
-See [INSTALL.md](INSTALL.md) for instructions.
+See [INSTALL.md](https://github.com/scipopt/PySCIPOpt/blob/master/INSTALL.md) for instructions.
 Please note that the latest PySCIPOpt version is usually only compatible with the latest major release of the SCIP Optimization Suite.
 The following table summarizes which version of PySCIPOpt is required for a given SCIP version:
 
 |SCIP| PySCIPOpt |
 |----|----|
+9.0 | 5.x
 8.0 | 4.x
 7.0 | 3.x
 6.0 | 2.x
@@ -65,14 +68,14 @@ The following table summarizes which version of PySCIPOpt is required for a give
 4.0 | 1.2, 1.1
 3.2 | 1.0
 
-Information which version of PySCIPOpt is required for a given SCIP version can also be found in [INSTALL.md](INSTALL.md).
+Information which version of PySCIPOpt is required for a given SCIP version can also be found in [INSTALL.md](https://github.com/scipopt/PySCIPOpt/blob/master/INSTALL.md).
 
 Building and solving a model
 ----------------------------
 
-There are several [examples](examples/finished) and
-[tutorials](examples/tutorial). These display some functionality of the
-interface and can serve as an entry point for writing more complex code.
+There are several [examples](https://github.com/scipopt/PySCIPOpt/blob/master/examples/finished) and
+[tutorials](https://github.com/scipopt/PySCIPOpt/blob/master/examples/tutorial). These display some functionality of the
+interface and can serve as an entry point for writing more complex code. Some of the common usecases are also available in the [recipes](https://github.com/scipopt/PySCIPOpt/blob/master/src/pyscipopt/recipes) sub-package.
 You might also want to have a look at this article about PySCIPOpt:
 <https://opus4.kobv.de/opus4-zib/frontdoor/index/index/docId/6045>. The
 following steps are always required when using the interface:
@@ -146,7 +149,7 @@ functionality you require.
 We are always happy to accept pull request containing patches or
 extensions!
 
-Please have a look at our [contribution guidelines](CONTRIBUTING.md).
+Please have a look at our [contribution guidelines](https://github.com/scipopt/PySCIPOpt/blob/master/CONTRIBUTING.md).
 
 Gotchas
 -------

{PySCIPOpt-4.4.0 → pyscipopt-5.0.1}/PySCIPOpt.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ PySCIPOpt.egg-info/dependency_links.txt
 PySCIPOpt.egg-info/top_level.txt
 src/pyscipopt/Multidict.py
 src/pyscipopt/__init__.py
+src/pyscipopt/_version.py
 src/pyscipopt/benders.pxi
 src/pyscipopt/benderscut.pxi
 src/pyscipopt/branchrule.pxi
@@ -29,6 +30,10 @@ src/pyscipopt/scip.pxd
 src/pyscipopt/scip.pxi
 src/pyscipopt/scip.pyx
 src/pyscipopt/sepa.pxi
+src/pyscipopt/recipes/__init__.py
+src/pyscipopt/recipes/infeasibilities.py
+src/pyscipopt/recipes/nonlinear.py
+src/pyscipopt/recipes/piecewise.py
 tests/test_alldiff.py
 tests/test_benders.py
 tests/test_branch_incomplete.py
@@ -56,6 +61,9 @@ tests/test_quadcons.py
 tests/test_quickprod.py
 tests/test_quicksum.py
 tests/test_reader.py
+tests/test_recipe_infeasibilities.py
+tests/test_recipe_nonlinear.py
+tests/test_recipe_piecewise.py
 tests/test_relax.py
 tests/test_reopt.py
 tests/test_short.py

{PySCIPOpt-4.4.0 → pyscipopt-5.0.1}/README.md

@@ -15,7 +15,7 @@ Documentation
 
 Please consult the [online documentation](https://scipopt.github.io/PySCIPOpt/docs/html) or use the `help()` function directly in Python or `?` in IPython/Jupyter.
 
-See [CHANGELOG.md](CHANGELOG.md) for added, removed or fixed functionality.
+See [CHANGELOG.md](https://github.com/scipopt/PySCIPOpt/blob/master/CHANGELOG.md) for added, removed or fixed functionality.
 
 Installation
 ------------
@@ -34,12 +34,13 @@ conda install --channel conda-forge pyscipopt
 
 **Using PyPI and from Source**
 
-See [INSTALL.md](INSTALL.md) for instructions.
+See [INSTALL.md](https://github.com/scipopt/PySCIPOpt/blob/master/INSTALL.md) for instructions.
 Please note that the latest PySCIPOpt version is usually only compatible with the latest major release of the SCIP Optimization Suite.
 The following table summarizes which version of PySCIPOpt is required for a given SCIP version:
 
 |SCIP| PySCIPOpt |
 |----|----|
+9.0 | 5.x
 8.0 | 4.x
 7.0 | 3.x
 6.0 | 2.x
@@ -47,14 +48,14 @@ The following table summarizes which version of PySCIPOpt is required for a give
 4.0 | 1.2, 1.1
 3.2 | 1.0
 
-Information which version of PySCIPOpt is required for a given SCIP version can also be found in [INSTALL.md](INSTALL.md).
+Information which version of PySCIPOpt is required for a given SCIP version can also be found in [INSTALL.md](https://github.com/scipopt/PySCIPOpt/blob/master/INSTALL.md).
 
 Building and solving a model
 ----------------------------
 
-There are several [examples](examples/finished) and
-[tutorials](examples/tutorial). These display some functionality of the
-interface and can serve as an entry point for writing more complex code.
+There are several [examples](https://github.com/scipopt/PySCIPOpt/blob/master/examples/finished) and
+[tutorials](https://github.com/scipopt/PySCIPOpt/blob/master/examples/tutorial). These display some functionality of the
+interface and can serve as an entry point for writing more complex code. Some of the common usecases are also available in the [recipes](https://github.com/scipopt/PySCIPOpt/blob/master/src/pyscipopt/recipes) sub-package.
 You might also want to have a look at this article about PySCIPOpt:
 <https://opus4.kobv.de/opus4-zib/frontdoor/index/index/docId/6045>. The
 following steps are always required when using the interface:
@@ -128,7 +129,7 @@ functionality you require.
 We are always happy to accept pull request containing patches or
 extensions!
 
-Please have a look at our [contribution guidelines](CONTRIBUTING.md).
+Please have a look at our [contribution guidelines](https://github.com/scipopt/PySCIPOpt/blob/master/CONTRIBUTING.md).
 
 Gotchas
 -------

pyscipopt-5.0.1/pyproject.toml

@@ -0,0 +1,85 @@
+[build-system]
+requires = ['setuptools', 'cython >=3.0.10']
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "PySCIPOpt"
+description = "Python interface and modeling environment for SCIP"
+authors = [
+    {name = "Zuse Institute Berlin", email = "scip@zib.de"},
+]
+dependencies = []
+requires-python = ">=3.8"
+readme = "README.md"
+license = {text = "MIT"}
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Education",
+    "Intended Audience :: Science/Research",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Cython",
+    "Programming Language :: Python :: 3",
+    "Topic :: Scientific/Engineering :: Mathematics",
+]
+dynamic = ["version"]
+
+[project.urls]
+Homepage = "https://github.com/SCIP-Interfaces/PySCIPOpt"
+
+[tool.pytest.ini_options]
+norecursedirs = ["check"]
+testpaths = ["tests"]
+
+[tool.setuptools]
+include-package-data = false
+
+[tool.setuptools.dynamic]
+version = {attr = "pyscipopt._version.__version__"}
+
+[tool.cibuildwheel]
+skip="pp*" # currently doesn't work with PyPy
+
+
+[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.3.0/libscip-linux.zip -O scip.zip",
+    "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"}
+
+
+[tool.cibuildwheel.macos]
+skip="pp* cp36* cp37*"
+before-all = '''
+#!/bin/bash
+brew install wget zlib gcc
+if [[ $CIBW_ARCHS == *"arm"* ]]; then
+    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.3.0/libscip-macos-arm.zip -O scip.zip
+else
+    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.3.0/libscip-macos.zip -O scip.zip
+fi
+unzip scip.zip
+mv scip_install src/scip
+'''
+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"}
+repair-wheel-command = [
+  "delocate-listdeps {wheel}",
+  "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}",
+]
+
+
+[tool.cibuildwheel.windows]
+skip="pp* cp36* cp37*"
+before-all = [
+    "choco install 7zip wget",
+    "wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.3.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"
+]
+before-build = "pip install delvewheel"
+environment = { SCIPOPTDIR='D:\\a\\PySCIPOpt\\PySCIPOpt\\scip' }
+repair-wheel-command = "delvewheel repair --add-path c:/bin;c:/lib;c:/bin/src;c:/lib/src;D:/a/PySCIPOpt/PySCIPOpt/scip/;D:/a/PySCIPOpt/PySCIPOpt/scip/lib/;D:/a/PySCIPOpt/PySCIPOpt/scip/bin/ -w {dest_dir} {wheel}"

{PySCIPOpt-4.4.0 → pyscipopt-5.0.1}/setup.cfg

@@ -1,7 +1,3 @@
-[tool:pytest]
-norecursedirs = check
-testpaths = tests
-
 [bdist_wheel]
 universal = 1
 

{PySCIPOpt-4.4.0 → pyscipopt-5.0.1}/setup.py

@@ -1,4 +1,4 @@
-from setuptools import setup, Extension
+from setuptools import find_packages, setup, Extension
 import os, platform, sys, re
 
 # look for environment variable that specifies path to SCIP
@@ -69,11 +69,6 @@ use_cython = True
 
 packagedir = os.path.join("src", "pyscipopt")
 
-with open(os.path.join(packagedir, "__init__.py"), "r") as initfile:
-    version = re.search(
-        r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', initfile.read(), re.MULTILINE
-    ).group(1)
-
 try:
     from Cython.Build import cythonize
 except ImportError as err:
@@ -111,7 +106,7 @@ with open("README.md") as f:
 
 setup(
     name="PySCIPOpt",
-    version="4.4.0",
+    version="5.0.1",
     description="Python interface and modeling environment for SCIP",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -129,7 +124,7 @@ setup(
         "Topic :: Scientific/Engineering :: Mathematics",
     ],
     ext_modules=extensions,
-    packages=["pyscipopt"],
+    packages=find_packages(where="src"),
     package_dir={"pyscipopt": packagedir},
     package_data={"pyscipopt": ["scip.pyx", "scip.pxd", "*.pxi", "scip/lib/*"]},
     include_package_data=True,

{PySCIPOpt-4.4.0 → pyscipopt-5.0.1}/src/pyscipopt/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '4.4.0'
+from ._version import __version__
 
 # required for Python 3.8 on Windows
 import os
@@ -9,6 +9,8 @@ if hasattr(os, 'add_dll_directory'):
 # export user-relevant objects:
 from pyscipopt.Multidict import multidict
 from pyscipopt.scip      import Model
+from pyscipopt.scip      import Variable
+from pyscipopt.scip      import Constraint
 from pyscipopt.scip      import Benders
 from pyscipopt.scip      import Benderscut
 from pyscipopt.scip      import Branchrule

pyscipopt-5.0.1/src/pyscipopt/_version.py

@@ -0,0 +1 @@
+__version__ = '5.0.1'

{PySCIPOpt-4.4.0 → pyscipopt-5.0.1}/src/pyscipopt/benders.pxi

@@ -70,10 +70,10 @@ cdef Variable getPyVar(SCIP_VAR* var):
     return <Variable>vardata
 
 
-cdef SCIP_RETCODE PyBendersCopy (SCIP* scip, SCIP_BENDERS* benders, SCIP_Bool threadsafe) with gil:
+cdef SCIP_RETCODE PyBendersCopy (SCIP* scip, SCIP_BENDERS* benders, SCIP_Bool threadsafe) noexcept with gil:
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBendersFree (SCIP* scip, SCIP_BENDERS* benders) with gil:
+cdef SCIP_RETCODE PyBendersFree (SCIP* scip, SCIP_BENDERS* benders) noexcept with gil:
     cdef SCIP_BENDERSDATA* bendersdata
     bendersdata = SCIPbendersGetData(benders)
     PyBenders = <Benders>bendersdata
@@ -81,56 +81,56 @@ cdef SCIP_RETCODE PyBendersFree (SCIP* scip, SCIP_BENDERS* benders) with gil:
     Py_DECREF(PyBenders)
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBendersInit (SCIP* scip, SCIP_BENDERS* benders) with gil:
+cdef SCIP_RETCODE PyBendersInit (SCIP* scip, SCIP_BENDERS* benders) noexcept with gil:
     cdef SCIP_BENDERSDATA* bendersdata
     bendersdata = SCIPbendersGetData(benders)
     PyBenders = <Benders>bendersdata
     PyBenders.bendersinit()
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBendersExit (SCIP* scip, SCIP_BENDERS* benders) with gil:
+cdef SCIP_RETCODE PyBendersExit (SCIP* scip, SCIP_BENDERS* benders) noexcept with gil:
     cdef SCIP_BENDERSDATA* bendersdata
     bendersdata = SCIPbendersGetData(benders)
     PyBenders = <Benders>bendersdata
     PyBenders.bendersexit()
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBendersInitpre (SCIP* scip, SCIP_BENDERS* benders) with gil:
+cdef SCIP_RETCODE PyBendersInitpre (SCIP* scip, SCIP_BENDERS* benders) noexcept with gil:
     cdef SCIP_BENDERSDATA* bendersdata
     bendersdata = SCIPbendersGetData(benders)
     PyBenders = <Benders>bendersdata
     PyBenders.bendersinitpre()
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBendersExitpre (SCIP* scip, SCIP_BENDERS* benders) with gil:
+cdef SCIP_RETCODE PyBendersExitpre (SCIP* scip, SCIP_BENDERS* benders) noexcept with gil:
     cdef SCIP_BENDERSDATA* bendersdata
     bendersdata = SCIPbendersGetData(benders)
     PyBenders = <Benders>bendersdata
     PyBenders.bendersexitpre()
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBendersInitsol (SCIP* scip, SCIP_BENDERS* benders) with gil:
+cdef SCIP_RETCODE PyBendersInitsol (SCIP* scip, SCIP_BENDERS* benders) noexcept with gil:
     cdef SCIP_BENDERSDATA* bendersdata
     bendersdata = SCIPbendersGetData(benders)
     PyBenders = <Benders>bendersdata
     PyBenders.bendersinitsol()
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBendersExitsol (SCIP* scip, SCIP_BENDERS* benders) with gil:
+cdef SCIP_RETCODE PyBendersExitsol (SCIP* scip, SCIP_BENDERS* benders) noexcept with gil:
     cdef SCIP_BENDERSDATA* bendersdata
     bendersdata = SCIPbendersGetData(benders)
     PyBenders = <Benders>bendersdata
     PyBenders.bendersexitsol()
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBendersCreatesub (SCIP* scip, SCIP_BENDERS* benders, int probnumber) with gil:
+cdef SCIP_RETCODE PyBendersCreatesub (SCIP* scip, SCIP_BENDERS* benders, int probnumber) noexcept with gil:
     cdef SCIP_BENDERSDATA* bendersdata
     bendersdata = SCIPbendersGetData(benders)
     PyBenders = <Benders>bendersdata
     PyBenders.benderscreatesub(probnumber)
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBendersPresubsolve (SCIP* scip, SCIP_BENDERS* benders, SCIP_SOL* sol, SCIP_BENDERSENFOTYPE type, SCIP_Bool checkint, SCIP_Bool* infeasible, SCIP_Bool* auxviol, SCIP_Bool* skipsolve,  SCIP_RESULT* result) with gil:
+cdef SCIP_RETCODE PyBendersPresubsolve (SCIP* scip, SCIP_BENDERS* benders, SCIP_SOL* sol, SCIP_BENDERSENFOTYPE type, SCIP_Bool checkint, SCIP_Bool* infeasible, SCIP_Bool* auxviol, SCIP_Bool* skipsolve,  SCIP_RESULT* result) noexcept with gil:
     cdef SCIP_BENDERSDATA* bendersdata
     bendersdata = SCIPbendersGetData(benders)
     PyBenders = <Benders>bendersdata
@@ -146,7 +146,7 @@ cdef SCIP_RETCODE PyBendersPresubsolve (SCIP* scip, SCIP_BENDERS* benders, SCIP_
     result[0] = result_dict.get("result", <SCIP_RESULT>result[0])
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBendersSolvesubconvex (SCIP* scip, SCIP_BENDERS* benders, SCIP_SOL* sol, int probnumber, SCIP_Bool onlyconvex, SCIP_Real* objective, SCIP_RESULT* result) with gil:
+cdef SCIP_RETCODE PyBendersSolvesubconvex (SCIP* scip, SCIP_BENDERS* benders, SCIP_SOL* sol, int probnumber, SCIP_Bool onlyconvex, SCIP_Real* objective, SCIP_RESULT* result) noexcept with gil:
     cdef SCIP_BENDERSDATA* bendersdata
     bendersdata = SCIPbendersGetData(benders)
     PyBenders = <Benders>bendersdata
@@ -159,7 +159,7 @@ cdef SCIP_RETCODE PyBendersSolvesubconvex (SCIP* scip, SCIP_BENDERS* benders, SC
     result[0] = result_dict.get("result", <SCIP_RESULT>result[0])
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBendersSolvesub (SCIP* scip, SCIP_BENDERS* benders, SCIP_SOL* sol, int probnumber, SCIP_Real* objective, SCIP_RESULT* result) with gil:
+cdef SCIP_RETCODE PyBendersSolvesub (SCIP* scip, SCIP_BENDERS* benders, SCIP_SOL* sol, int probnumber, SCIP_Real* objective, SCIP_RESULT* result) noexcept with gil:
     cdef SCIP_BENDERSDATA* bendersdata
     bendersdata = SCIPbendersGetData(benders)
     PyBenders = <Benders>bendersdata
@@ -174,7 +174,7 @@ cdef SCIP_RETCODE PyBendersSolvesub (SCIP* scip, SCIP_BENDERS* benders, SCIP_SOL
 
 cdef SCIP_RETCODE PyBendersPostsolve (SCIP* scip, SCIP_BENDERS* benders, SCIP_SOL* sol,
         SCIP_BENDERSENFOTYPE type, int* mergecands, int npriomergecands, int nmergecands, SCIP_Bool checkint,
-        SCIP_Bool infeasible, SCIP_Bool* merged) with  gil:
+        SCIP_Bool infeasible, SCIP_Bool* merged) noexcept with gil:
     cdef SCIP_BENDERSDATA* bendersdata
     bendersdata = SCIPbendersGetData(benders)
     PyBenders = <Benders>bendersdata
@@ -190,7 +190,7 @@ cdef SCIP_RETCODE PyBendersPostsolve (SCIP* scip, SCIP_BENDERS* benders, SCIP_SO
     merged[0] = result_dict.get("merged", False)
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBendersFreesub (SCIP* scip, SCIP_BENDERS* benders, int probnumber) with gil:
+cdef SCIP_RETCODE PyBendersFreesub (SCIP* scip, SCIP_BENDERS* benders, int probnumber) noexcept with gil:
     cdef SCIP_BENDERSDATA* bendersdata
     bendersdata = SCIPbendersGetData(benders)
     PyBenders = <Benders>bendersdata
@@ -198,7 +198,7 @@ cdef SCIP_RETCODE PyBendersFreesub (SCIP* scip, SCIP_BENDERS* benders, int probn
     return SCIP_OKAY
 
 #TODO: Really need to ask about the passing and returning of variables
-cdef SCIP_RETCODE PyBendersGetvar (SCIP* scip, SCIP_BENDERS* benders, SCIP_VAR* var, SCIP_VAR** mappedvar, int probnumber) with gil:
+cdef SCIP_RETCODE PyBendersGetvar (SCIP* scip, SCIP_BENDERS* benders, SCIP_VAR* var, SCIP_VAR** mappedvar, int probnumber) noexcept with gil:
     cdef SCIP_BENDERSDATA* bendersdata
     bendersdata = SCIPbendersGetData(benders)
     PyBenders = <Benders>bendersdata

{PySCIPOpt-4.4.0 → pyscipopt-5.0.1}/src/pyscipopt/benderscut.pxi

@@ -24,10 +24,10 @@ cdef class Benderscut:
         print("python error in benderscutexec: this method needs to be implemented")
         return {}
 
-cdef SCIP_RETCODE PyBenderscutCopy (SCIP* scip, SCIP_BENDERS* benders, SCIP_BENDERSCUT* benderscut) with gil:
+cdef SCIP_RETCODE PyBenderscutCopy (SCIP* scip, SCIP_BENDERS* benders, SCIP_BENDERSCUT* benderscut) noexcept with gil:
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBenderscutFree (SCIP* scip, SCIP_BENDERSCUT* benderscut) with gil:
+cdef SCIP_RETCODE PyBenderscutFree (SCIP* scip, SCIP_BENDERSCUT* benderscut) noexcept with gil:
     cdef SCIP_BENDERSCUTDATA* benderscutdata
     benderscutdata = SCIPbenderscutGetData(benderscut)
     PyBenderscut = <Benderscut>benderscutdata
@@ -35,35 +35,35 @@ cdef SCIP_RETCODE PyBenderscutFree (SCIP* scip, SCIP_BENDERSCUT* benderscut) wit
     Py_DECREF(PyBenderscut)
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBenderscutInit (SCIP* scip, SCIP_BENDERSCUT* benderscut) with gil:
+cdef SCIP_RETCODE PyBenderscutInit (SCIP* scip, SCIP_BENDERSCUT* benderscut) noexcept with gil:
     cdef SCIP_BENDERSCUTDATA* benderscutdata
     benderscutdata = SCIPbenderscutGetData(benderscut)
     PyBenderscut = <Benderscut>benderscutdata
     PyBenderscut.benderscutinit()
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBenderscutExit (SCIP* scip, SCIP_BENDERSCUT* benderscut) with gil:
+cdef SCIP_RETCODE PyBenderscutExit (SCIP* scip, SCIP_BENDERSCUT* benderscut) noexcept with gil:
     cdef SCIP_BENDERSCUTDATA* benderscutdata
     benderscutdata = SCIPbenderscutGetData(benderscut)
     PyBenderscut = <Benderscut>benderscutdata
     PyBenderscut.benderscutexit()
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBenderscutInitsol (SCIP* scip, SCIP_BENDERSCUT* benderscut) with gil:
+cdef SCIP_RETCODE PyBenderscutInitsol (SCIP* scip, SCIP_BENDERSCUT* benderscut) noexcept with gil:
     cdef SCIP_BENDERSCUTDATA* benderscutdata
     benderscutdata = SCIPbenderscutGetData(benderscut)
     PyBenderscut = <Benderscut>benderscutdata
     PyBenderscut.benderscutinitsol()
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBenderscutExitsol (SCIP* scip, SCIP_BENDERSCUT* benderscut) with gil:
+cdef SCIP_RETCODE PyBenderscutExitsol (SCIP* scip, SCIP_BENDERSCUT* benderscut) noexcept with gil:
     cdef SCIP_BENDERSCUTDATA* benderscutdata
     benderscutdata = SCIPbenderscutGetData(benderscut)
     PyBenderscut = <Benderscut>benderscutdata
     PyBenderscut.benderscutexitsol()
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBenderscutExec (SCIP* scip, SCIP_BENDERS* benders, SCIP_BENDERSCUT* benderscut, SCIP_SOL* sol, int probnumber, SCIP_BENDERSENFOTYPE type, SCIP_RESULT* result) with gil:
+cdef SCIP_RETCODE PyBenderscutExec (SCIP* scip, SCIP_BENDERS* benders, SCIP_BENDERSCUT* benderscut, SCIP_SOL* sol, int probnumber, SCIP_BENDERSENFOTYPE type, SCIP_RESULT* result) noexcept with gil:
     cdef SCIP_BENDERSCUTDATA* benderscutdata
     benderscutdata = SCIPbenderscutGetData(benderscut)
     PyBenderscut = <Benderscut>benderscutdata

{PySCIPOpt-4.4.0 → pyscipopt-5.0.1}/src/pyscipopt/branchrule.pxi

@@ -39,10 +39,10 @@ cdef class Branchrule:
 
 
 
-cdef SCIP_RETCODE PyBranchruleCopy (SCIP* scip, SCIP_BRANCHRULE* branchrule) with gil:
+cdef SCIP_RETCODE PyBranchruleCopy (SCIP* scip, SCIP_BRANCHRULE* branchrule) noexcept with gil:
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBranchruleFree (SCIP* scip, SCIP_BRANCHRULE* branchrule) with gil:
+cdef SCIP_RETCODE PyBranchruleFree (SCIP* scip, SCIP_BRANCHRULE* branchrule) noexcept with gil:
     cdef SCIP_BRANCHRULEDATA* branchruledata
     branchruledata = SCIPbranchruleGetData(branchrule)
     PyBranchrule = <Branchrule>branchruledata
@@ -50,35 +50,35 @@ cdef SCIP_RETCODE PyBranchruleFree (SCIP* scip, SCIP_BRANCHRULE* branchrule) wit
     Py_DECREF(PyBranchrule)
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBranchruleInit (SCIP* scip, SCIP_BRANCHRULE* branchrule) with gil:
+cdef SCIP_RETCODE PyBranchruleInit (SCIP* scip, SCIP_BRANCHRULE* branchrule) noexcept with gil:
     cdef SCIP_BRANCHRULEDATA* branchruledata
     branchruledata = SCIPbranchruleGetData(branchrule)
     PyBranchrule = <Branchrule>branchruledata
     PyBranchrule.branchinit()
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBranchruleExit (SCIP* scip, SCIP_BRANCHRULE* branchrule) with gil:
+cdef SCIP_RETCODE PyBranchruleExit (SCIP* scip, SCIP_BRANCHRULE* branchrule) noexcept with gil:
     cdef SCIP_BRANCHRULEDATA* branchruledata
     branchruledata = SCIPbranchruleGetData(branchrule)
     PyBranchrule = <Branchrule>branchruledata
     PyBranchrule.branchexit()
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBranchruleInitsol (SCIP* scip, SCIP_BRANCHRULE* branchrule) with gil:
+cdef SCIP_RETCODE PyBranchruleInitsol (SCIP* scip, SCIP_BRANCHRULE* branchrule) noexcept with gil:
     cdef SCIP_BRANCHRULEDATA* branchruledata
     branchruledata = SCIPbranchruleGetData(branchrule)
     PyBranchrule = <Branchrule>branchruledata
     PyBranchrule.branchinitsol()
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBranchruleExitsol (SCIP* scip, SCIP_BRANCHRULE* branchrule) with gil:
+cdef SCIP_RETCODE PyBranchruleExitsol (SCIP* scip, SCIP_BRANCHRULE* branchrule) noexcept with gil:
     cdef SCIP_BRANCHRULEDATA* branchruledata
     branchruledata = SCIPbranchruleGetData(branchrule)
     PyBranchrule = <Branchrule>branchruledata
     PyBranchrule.branchexitsol()
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBranchruleExeclp (SCIP* scip, SCIP_BRANCHRULE* branchrule, SCIP_Bool allowaddcons, SCIP_RESULT* result) with gil:
+cdef SCIP_RETCODE PyBranchruleExeclp (SCIP* scip, SCIP_BRANCHRULE* branchrule, SCIP_Bool allowaddcons, SCIP_RESULT* result) noexcept with gil:
     cdef SCIP_BRANCHRULEDATA* branchruledata
     branchruledata = SCIPbranchruleGetData(branchrule)
     PyBranchrule = <Branchrule>branchruledata
@@ -86,7 +86,7 @@ cdef SCIP_RETCODE PyBranchruleExeclp (SCIP* scip, SCIP_BRANCHRULE* branchrule, S
     result[0] = result_dict.get("result", <SCIP_RESULT>result[0])
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBranchruleExecext(SCIP* scip, SCIP_BRANCHRULE* branchrule, SCIP_Bool allowaddcons, SCIP_RESULT* result) with gil:
+cdef SCIP_RETCODE PyBranchruleExecext(SCIP* scip, SCIP_BRANCHRULE* branchrule, SCIP_Bool allowaddcons, SCIP_RESULT* result) noexcept with gil:
     cdef SCIP_BRANCHRULEDATA* branchruledata
     branchruledata = SCIPbranchruleGetData(branchrule)
     PyBranchrule = <Branchrule>branchruledata
@@ -94,7 +94,7 @@ cdef SCIP_RETCODE PyBranchruleExecext(SCIP* scip, SCIP_BRANCHRULE* branchrule, S
     result[0] = result_dict.get("result", <SCIP_RESULT>result[0])
     return SCIP_OKAY
 
-cdef SCIP_RETCODE PyBranchruleExecps(SCIP* scip, SCIP_BRANCHRULE* branchrule, SCIP_Bool allowaddcons, SCIP_RESULT* result) with gil:
+cdef SCIP_RETCODE PyBranchruleExecps(SCIP* scip, SCIP_BRANCHRULE* branchrule, SCIP_Bool allowaddcons, SCIP_RESULT* result) noexcept with gil:
     cdef SCIP_BRANCHRULEDATA* branchruledata
     branchruledata = SCIPbranchruleGetData(branchrule)
     PyBranchrule = <Branchrule>branchruledata