MAINT: Use an internally built highspy

scipy · Oct 1, 2023 · 703fc8e · 703fc8e
1 parent 76c7af1
commit 703fc8e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/scipy/optimize/_highs/_highs_wrapper.py b/scipy/optimize/_highs/_highs_wrapper.py
@@ -1,8 +1,8 @@
 from warnings import warn
 
 import numpy as np
-from highspy  import _highs as hspy  # type: ignore[attr-defined]
-from highspy import _highs_options as hopt  # type: ignore[attr-defined]
+from scipy.optimize._highs.highspy import highs as hspy  # type: ignore[attr-defined]
+from scipy.optimize._highs.highspy import _highs_options as hopt  # type: ignore[attr-defined]
 from scipy.optimize import OptimizeWarning
 
 def _highs_wrapper(c, indptr, indices, data, lhs, rhs, lb, ub, integrality, options):

diff --git a/scipy/optimize/_highs/meson.build b/scipy/optimize/_highs/meson.build
@@ -18,7 +18,7 @@ py3.extension_module(
   dependencies: [pyb11_dep, highs_dep],
   c_args: [Wno_unused_variable, Wno_unused_but_set_variable],
   cpp_args: [_cpp_Wno_unused_variable, _cpp_Wno_unused_but_set_variable],
-  subdir: 'highspy',
+  subdir: 'scipy/optimize/_highs/highspy',
   install: true,
 )
 
@@ -29,13 +29,13 @@ py3.extension_module(
   dependencies: [pyb11_dep, highs_dep],
   c_args: [Wno_unused_variable, Wno_unused_but_set_variable],
   cpp_args: [_cpp_Wno_unused_variable, _cpp_Wno_unused_but_set_variable],
-  subdir: 'highspy',
+  subdir: 'scipy/optimize/_highs/highspy',
   install: true,
 )
 
 py3.install_sources(
   highspy_py,
-  subdir: 'highspy',
+  subdir: 'scipy/optimize/_highs/highspy',
 )
 
 py3.install_sources([

diff --git a/scipy/optimize/_linprog_highs.py b/scipy/optimize/_linprog_highs.py
@@ -20,9 +20,9 @@
 from ._highs._highs_wrapper import _highs_wrapper
 from scipy.sparse import csc_matrix, vstack, issparse
 
-from highspy._highs import HighsModelStatus as hms
-from highspy._highs import simplex_constants as simpc
-import highspy._highs as hspy
+from scipy.optimize._highs.highspy.highs import HighsModelStatus as hms
+from scipy.optimize._highs.highspy.highs import simpc
+from scipy.optimize._highs.highspy import highs as hspy
 
 class SciPyRC(Enum):
     """Return codes for SciPy solvers"""

diff --git a/subprojects/highs.wrap b/subprojects/highs.wrap
@@ -1,3 +1,3 @@
 [wrap-git]
 url = https://github.com/HaoZeke/highs.git
-revision = 9874fcb3a6c561c394c5f831614bfc9ed6dce12f
+revision = 06fa7818073db142efdc0ccb888cfc4fe9776720