Skip to content

Commit e4e0aba

Browse files
authored
Merge pull request #217 from cvxgrp/216-relax-numpy
216 relax numpy
2 parents 07797aa + 695152a commit e4e0aba

File tree

6 files changed

+16
-8
lines changed

6 files changed

+16
-8
lines changed

cvx/cla/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,8 @@
2222
The main class to use is CLA, which implements the algorithm and provides
2323
methods to compute and analyze the efficient frontier.
2424
"""
25+
import importlib.metadata
2526

2627
from .cla import CLA
28+
29+
__version__ = importlib.metadata.version("cvxcla")

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ description = "Critical line algorithm for the efficient frontier"
55
readme = "README.md"
66
requires-python = ">=3.10"
77
dependencies = [
8-
"cvxpy-base>=1.6.0",
9-
"numpy>=2.1.3",
8+
"cvxpy-base>=1.5.1",
9+
"numpy>=2.0.0",
1010
"scipy>=1.14.1",
11-
"clarabel"
11+
"clarabel>=0.9.0"
1212
]
1313

1414
# add Philipp

tests/test_frontier.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import numpy as np
77
import pytest
88

9-
from cvx.cla.cla import CLA as MARKOWITZ
9+
from cvx.cla import CLA as MARKOWITZ
1010
from tests.bailey.cla import CLA as BAILEY
1111

1212
# np.random.seed(40)

tests/test_solver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import pytest
55
from pandas import DataFrame
66

7-
from cvx.cla.cla import CLA as MARKOWITZ
7+
from cvx.cla import CLA as MARKOWITZ
88
from tests.bailey.cla import CLA as BAILEY
99

1010

tests/test_version.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import cvx.cla as cvxcla
2+
3+
4+
def test_version():
5+
assert cvxcla.__version__ is not None

uv.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)