sagemath · vbraun · Mar 26, 2023 · Jun 12, 2021 · Mar 10, 2022 · Mar 12, 2022
diff --git a/build/pkgs/cvxpy/SPKG.rst b/build/pkgs/cvxpy/SPKG.rst
@@ -0,0 +1,18 @@
+cvxpy: A domain-specific language for modeling convex optimization problems in Python.
+======================================================================================
+
+Description
+-----------
+
+A domain-specific language for modeling convex optimization problems in Python.
+
+License
+-------
+
+Apache License, Version 2.0
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/cvxpy/
+
diff --git a/build/pkgs/cvxpy/checksums.ini b/build/pkgs/cvxpy/checksums.ini
@@ -0,0 +1,5 @@
+tarball=cvxpy-VERSION.tar.gz
+sha1=8c87f8f8c2177f917ec2fad7d2b510787ffdf72d
+md5=408b0a3140750299207f61de95b4ed6e
+cksum=3643150234
+upstream_url=https://pypi.io/packages/source/c/cvxpy/cvxpy-VERSION.tar.gz
diff --git a/build/pkgs/cvxpy/dependencies b/build/pkgs/cvxpy/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) numpy scipy glpk cvxopt osqp_python ecos_python scs | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/cvxpy/distros/conda.txt b/build/pkgs/cvxpy/distros/conda.txt
@@ -0,0 +1 @@
+cvxpy
diff --git a/build/pkgs/cvxpy/install-requires.txt b/build/pkgs/cvxpy/install-requires.txt
@@ -0,0 +1 @@
+cvxpy
diff --git a/build/pkgs/cvxpy/package-version.txt b/build/pkgs/cvxpy/package-version.txt
@@ -0,0 +1 @@
+1.3.0
diff --git a/build/pkgs/cvxpy/spkg-install.in b/build/pkgs/cvxpy/spkg-install.in
@@ -0,0 +1,3 @@
+cd src
+# --no-build-isolation to ignore the numpy version pin in pyproject.toml
+sdh_pip_install --no-build-isolation .
diff --git a/build/pkgs/cvxpy/type b/build/pkgs/cvxpy/type
@@ -0,0 +1 @@
+optional
diff --git a/build/pkgs/cylp/SPKG.rst b/build/pkgs/cylp/SPKG.rst
@@ -9,7 +9,11 @@ A Python interface for CLP, CBC, and CGL
 License
 -------
 
-Eclipse Public License
+Eclipse Public License (EPL) version 2 (without a Secondary Licenses Notice).
+
+Note: This license is incompatible with the GPL according to
+https://www.gnu.org/licenses/license-list.html#EPL2;
+see also the discussion in :trac:`26511`.
 
 Upstream Contact
 ----------------

diff --git a/build/pkgs/cylp/checksums.ini b/build/pkgs/cylp/checksums.ini
@@ -1,5 +1,5 @@
 tarball=cylp-VERSION.tar.gz
-sha1=54965f2ae9b914df7817dffd53bc34925a6fadd4
-md5=a4f50e6b24a7fcd2e890a9e7e8825437
-cksum=4132703858
+sha1=1c2d20933abc48ed2fefc1ae45d8f9492fc2eef2
+md5=ac0308a916dac5dd84f831dbc0fba5c5
+cksum=1532166313
 upstream_url=https://pypi.io/packages/source/c/cylp/cylp-VERSION.tar.gz
diff --git a/build/pkgs/cylp/package-version.txt b/build/pkgs/cylp/package-version.txt
@@ -1 +1 @@
-0.91.4
+0.91.5
diff --git a/build/pkgs/cylp/patches/e619c4b94e279e96842da0d38ae657f06f1e9415.patch b/build/pkgs/cylp/patches/e619c4b94e279e96842da0d38ae657f06f1e9415.patch
diff --git a/build/pkgs/cylp/spkg-install.in b/build/pkgs/cylp/spkg-install.in
@@ -1,5 +1,5 @@
 cd src
-#export CYLP_USE_CYTHON=1
 # use pkg-config to discover coin installation
 unset COIN_INSTALL_DIR
-sdh_pip_install .
+# --no-build-isolation to ignore the numpy version pin in pyproject.toml
+sdh_pip_install --no-build-isolation .
diff --git a/build/pkgs/ecos_python/SPKG.rst b/build/pkgs/ecos_python/SPKG.rst
@@ -0,0 +1,20 @@
+ecos_python: Embedded Cone Solver (Python wrapper)
+==================================================
+
+Description
+-----------
+
+This is the Python package for ECOS: Embedded Cone Solver.
+
+It vendors ECOS.
+
+License
+-------
+
+GPLv3
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/ecos/
+
diff --git a/build/pkgs/ecos_python/checksums.ini b/build/pkgs/ecos_python/checksums.ini
@@ -0,0 +1,5 @@
+tarball=ecos-VERSION.tar.gz
+sha1=7afce63aec44522052e05fa2e1c82e12fe20fd45
+md5=a76939695aa07f8ab2f01a532732f348
+cksum=2810151369
+upstream_url=https://pypi.io/packages/source/e/ecos/ecos-VERSION.tar.gz
diff --git a/build/pkgs/ecos_python/dependencies b/build/pkgs/ecos_python/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) numpy scipy | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/ecos_python/distros/conda.txt b/build/pkgs/ecos_python/distros/conda.txt
@@ -0,0 +1 @@
+ecos
diff --git a/build/pkgs/ecos_python/install-requires.txt b/build/pkgs/ecos_python/install-requires.txt
@@ -0,0 +1 @@
+ecos
diff --git a/build/pkgs/ecos_python/package-version.txt b/build/pkgs/ecos_python/package-version.txt
@@ -0,0 +1 @@
+2.0.12
diff --git a/build/pkgs/ecos_python/spkg-install.in b/build/pkgs/ecos_python/spkg-install.in
@@ -0,0 +1,3 @@
+cd src
+# --no-build-isolation to ignore the numpy version pin in pyproject.toml
+sdh_pip_install --no-build-isolation .
diff --git a/build/pkgs/ecos_python/type b/build/pkgs/ecos_python/type
@@ -0,0 +1 @@
+optional
diff --git a/build/pkgs/osqp_python/SPKG.rst b/build/pkgs/osqp_python/SPKG.rst
@@ -0,0 +1,20 @@
+osqp_python: The Operator Splitting QP Solver (Python wrapper)
+==============================================================
+
+Description
+-----------
+
+This is the Python wrapper for OSQP: The Operator Splitting QP Solver.
+
+It vendors OSQP.
+
+License
+-------
+
+Apache 2.0
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/osqp/
+
diff --git a/build/pkgs/osqp_python/checksums.ini b/build/pkgs/osqp_python/checksums.ini
@@ -0,0 +1,5 @@
+tarball=osqp-VERSION.tar.gz
+sha1=d69d05b87c03aaaf80ac0bb11e1a68746cf8c486
+md5=ae46dc55aa4ff7a2009db756f2b61d98
+cksum=2780901429
+upstream_url=https://pypi.io/packages/source/o/osqp/osqp-VERSION.tar.gz
diff --git a/build/pkgs/osqp_python/dependencies b/build/pkgs/osqp_python/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) qdldl_python numpy scipy | $(PYTHON_TOOLCHAIN) cmake
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/osqp_python/distros/conda.txt b/build/pkgs/osqp_python/distros/conda.txt
@@ -0,0 +1 @@
+osqp
diff --git a/build/pkgs/osqp_python/install-requires.txt b/build/pkgs/osqp_python/install-requires.txt
@@ -0,0 +1 @@
+osqp
diff --git a/build/pkgs/osqp_python/package-version.txt b/build/pkgs/osqp_python/package-version.txt
@@ -0,0 +1 @@
+0.6.2.post8
diff --git a/build/pkgs/osqp_python/spkg-install.in b/build/pkgs/osqp_python/spkg-install.in
@@ -0,0 +1,3 @@
+cd src
+# --no-build-isolation to ignore the numpy version pin in pyproject.toml
+sdh_pip_install --no-build-isolation .
diff --git a/build/pkgs/osqp_python/type b/build/pkgs/osqp_python/type
@@ -0,0 +1 @@
+optional
diff --git a/build/pkgs/qdldl_python/SPKG.rst b/build/pkgs/qdldl_python/SPKG.rst
@@ -0,0 +1,18 @@
+qdldl_python: QDLDL, a free LDL factorization routine (Python wrapper)
+======================================================================
+
+Description
+-----------
+
+QDLDL, a free LDL factorization routine.
+
+License
+-------
+
+Apache 2.0
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/qdldl/
+
diff --git a/build/pkgs/qdldl_python/checksums.ini b/build/pkgs/qdldl_python/checksums.ini
@@ -0,0 +1,5 @@
+tarball=qdldl-VERSION.tar.gz
+sha1=af76c57ca1787f5e44e42f6c9f916b84ae599f1f
+md5=63d719bd8073c1661a1baa6b510b8aad
+cksum=105675620
+upstream_url=https://pypi.io/packages/source/q/qdldl/qdldl-VERSION.tar.gz
diff --git a/build/pkgs/qdldl_python/dependencies b/build/pkgs/qdldl_python/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) pybind11 numpy scipy | $(PYTHON_TOOLCHAIN) cmake
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/qdldl_python/distros/conda.txt b/build/pkgs/qdldl_python/distros/conda.txt
@@ -0,0 +1 @@
+qdldl-python
diff --git a/build/pkgs/qdldl_python/install-requires.txt b/build/pkgs/qdldl_python/install-requires.txt
@@ -0,0 +1 @@
+qdldl
diff --git a/build/pkgs/qdldl_python/package-version.txt b/build/pkgs/qdldl_python/package-version.txt
@@ -0,0 +1 @@
+0.1.5.post3
diff --git a/build/pkgs/qdldl_python/spkg-install.in b/build/pkgs/qdldl_python/spkg-install.in
@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .
diff --git a/build/pkgs/qdldl_python/type b/build/pkgs/qdldl_python/type
@@ -0,0 +1 @@
+optional
diff --git a/build/pkgs/scs/SPKG.rst b/build/pkgs/scs/SPKG.rst
@@ -0,0 +1,18 @@
+scs: Splitting conic solver
+===========================
+
+Description
+-----------
+
+scs: splitting conic solver
+
+License
+-------
+
+MIT
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/scs/
+
diff --git a/build/pkgs/scs/checksums.ini b/build/pkgs/scs/checksums.ini
@@ -0,0 +1,5 @@
+tarball=scs-VERSION.tar.gz
+sha1=309a035e5031f7a51c4992d5ad6c9236a406adc2
+md5=c984027aea923fa88e2f73c61bc06dd0
+cksum=1688898932
+upstream_url=https://pypi.io/packages/source/s/scs/scs-VERSION.tar.gz
diff --git a/build/pkgs/scs/dependencies b/build/pkgs/scs/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) numpy | $(PYTHON_TOOLCHAIN) cmake
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/scs/distros/conda.txt b/build/pkgs/scs/distros/conda.txt
@@ -0,0 +1 @@
+scs
diff --git a/build/pkgs/scs/install-requires.txt b/build/pkgs/scs/install-requires.txt
@@ -0,0 +1 @@
+scs
diff --git a/build/pkgs/scs/package-version.txt b/build/pkgs/scs/package-version.txt
@@ -0,0 +1 @@
+3.2.2
diff --git a/build/pkgs/scs/spkg-install.in b/build/pkgs/scs/spkg-install.in
@@ -0,0 +1,3 @@
+cd src
+# --no-build-isolation to ignore the numpy version pin in pyproject.toml
+sdh_pip_install --no-build-isolation .
diff --git a/build/pkgs/scs/type b/build/pkgs/scs/type
@@ -0,0 +1 @@
+optional
diff --git a/src/sage/combinat/matrices/dancing_links.pyx b/src/sage/combinat/matrices/dancing_links.pyx
@@ -1030,7 +1030,7 @@ cdef class dancing_linksWrapper:
             sage: d = dlx_solver(rows)
             sage: p,x = d.to_milp()
             sage: p
-            Boolean Program (no objective, 4 variables, 4 constraints)
+            Boolean Program (no objective, 4 variables, ... constraints)
             sage: x
             MIPVariable with 4 binary components
 
@@ -1041,7 +1041,7 @@ cdef class dancing_linksWrapper:
             Maximization:
             <BLANKLINE>
             <BLANKLINE>
-            Constraints:
+            Constraints:...
               one 1 in 0-th column: 1.0 <= x_0 + x_1 <= 1.0
               one 1 in 1-th column: 1.0 <= x_0 + x_2 <= 1.0
               one 1 in 2-th column: 1.0 <= x_0 + x_1 <= 1.0

diff --git a/src/sage/numerical/backends/cvxpy_backend.pxd b/src/sage/numerical/backends/cvxpy_backend.pxd
@@ -0,0 +1,40 @@
+##############################################################################
+#       Copyright (C) 2010 Nathann Cohen <[email protected]>
+#       Copyright (C) 2022 Matthias Koeppe <[email protected]>
+#  Distributed under the terms of the GNU General Public License (GPL)
+#  The full text of the GPL is available at:
+#                  http://www.gnu.org/licenses/
+##############################################################################
+
+from sage.numerical.backends.generic_backend cimport GenericBackend
+
+cdef class CVXPYBackend(GenericBackend):
+
+    cdef object variables
+    cdef object problem
+    cdef object prob_name
+    cdef object constraint_names
+
+    cdef object _cvxpy_solver
+    cdef object _cvxpy_solver_args
+
+    cdef list objective_coefficients
+    cdef list Matrix
+
+    cdef list row_lower_bound
+    cdef list row_upper_bound
+    cdef list col_lower_bound
+    cdef list col_upper_bound
+
+    cpdef int add_variable(self,
+                           lower_bound=*,
+                           upper_bound=*,
+                           binary=*,
+                           continuous=*,
+                           integer=*,
+                           obj=*,
+                           name=*,
+                           coefficients=*) \
+                           except -1
+
+    cpdef cvxpy_problem(self)