Skip to content

Commit 2fd122b

Browse files
author
Release Manager
committed
gh-36439: CVXpy 1.4.1, SCS 3.2.3, osqp_python 0.6.3, CVXOPT 1.3.2, CyLP 0.92.2, add `clarabel` solver <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> <!-- Why is this change required? What problem does it solve? --> Current CyLP version does not build with Cython 3. So we upgrade to the just-released CyLP 0.92.x. Other updates because they are available. <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36439 Reported by: Matthias Köppe Reviewer(s): Dima Pasechnik
2 parents ab24b1c + 3bc7ea6 commit 2fd122b

22 files changed

+65
-33
lines changed

‎build/pkgs/clarabel/SPKG.rst‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
clarabel: Clarabel Conic Interior Point Solver for Rust / Python
2+
================================================================
3+
4+
Description
5+
-----------
6+
7+
Clarabel Conic Interior Point Solver for Rust / Python
8+
9+
License
10+
-------
11+
12+
Apache-2.0
13+
14+
Upstream Contact
15+
----------------
16+
17+
https://pypi.org/project/clarabel/
18+

‎build/pkgs/clarabel/dependencies‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
| $(PYTHON_TOOLCHAIN) $(PYTHON)
2+
3+
----------
4+
All lines of this file are ignored except the first.

‎build/pkgs/clarabel/requirements.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
clarabel

‎build/pkgs/clarabel/type‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
optional

‎build/pkgs/cvxopt/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=cvxopt-VERSION.tar.gz
2-
sha1=7118b2c490a6596a47049c8ae6e15b3568239cb8
3-
md5=d94895acf6f41806b482791174e9d0e7
4-
cksum=2569244181
2+
sha1=f9c3c3fb61e87d27f05b3b66bc10734d5e6284e6
3+
md5=ced06e7d92d8a10c84db94589e7f8162
4+
cksum=2059529268
55
upstream_url=https://pypi.io/packages/source/c/cvxopt/cvxopt-VERSION.tar.gz

‎build/pkgs/cvxopt/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.0
1+
1.3.2

‎build/pkgs/cvxpy/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=cvxpy-VERSION.tar.gz
2-
sha1=8c87f8f8c2177f917ec2fad7d2b510787ffdf72d
3-
md5=408b0a3140750299207f61de95b4ed6e
4-
cksum=3643150234
2+
sha1=1ca24d9e2ee5add13b33724ab9a11e747fe4ed99
3+
md5=da9fa9feb9634d3562057484b9822889
4+
cksum=1557666297
55
upstream_url=https://pypi.io/packages/source/c/cvxpy/cvxpy-VERSION.tar.gz

‎build/pkgs/cvxpy/dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
numpy scipy glpk cvxopt osqp_python ecos_python scs | $(PYTHON_TOOLCHAIN) $(PYTHON)
1+
numpy scipy glpk cvxopt osqp_python ecos_python scs clarabel | $(PYTHON_TOOLCHAIN) $(PYTHON)
22

33
----------
44
All lines of this file are ignored except the first.

‎build/pkgs/cvxpy/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.0
1+
1.4.1

‎build/pkgs/cvxpy/spkg-install.in‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
cd src
2-
# --no-build-isolation to ignore the numpy version pin in pyproject.toml
3-
sdh_pip_install --no-build-isolation .
2+
# Remove numpy version pin in pyproject.toml
3+
sed -E -i.bak -e "s/numpy[ <>=]+[0-9,.<>= ]+/numpy/;" pyproject.toml
4+
cat pyproject.toml
5+
sdh_pip_install .

0 commit comments

Comments
 (0)