Skip to content

Commit 34883b0

Browse files
authored
Merge pull request #127 from cvxgrp/deptry
Update basic.yml
2 parents 0e98fb8 + adc7d46 commit 34883b0

File tree

7 files changed

+345
-162
lines changed

7 files changed

+345
-162
lines changed

.github/workflows/basic.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,9 @@ jobs:
2525
with:
2626
files: artifacts/tests/coverage/coverage.info
2727
format: lcov
28+
29+
deptry:
30+
runs-on: ubuntu-latest
31+
32+
steps:
33+
- uses: cvxgrp/.github/actions/deptry@main

cvx/cla/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
from cvx.cla.markowitz.cla import CLA
15+
from .markowitz.cla import CLA

cvx/cla/claux.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import numpy as np
1919

20-
from cvx.cla.first import init_algo
21-
from cvx.cla.types import MATRIX, Frontier, FrontierPoint, TurningPoint
20+
from .first import init_algo
21+
from .types import MATRIX, Frontier, FrontierPoint, TurningPoint
2222

2323

2424
@dataclass(frozen=True)

cvx/cla/first.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import cvxpy as cp
1717
import numpy as np
1818

19-
from cvx.cla.types import MATRIX, TurningPoint
19+
from .types import MATRIX, TurningPoint
2020

2121

2222
#

cvx/cla/markowitz/cla.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
import numpy as np
1717

18-
from cvx.cla.claux import CLAUX
19-
from cvx.cla.types import TurningPoint
18+
from ..claux import CLAUX
19+
from ..types import TurningPoint
2020

2121

2222
@dataclass(frozen=True)

poetry.lock

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

pyproject.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ python = ">=3.9,<3.12"
1212
numpy = "*"
1313
scipy = ">=1.10.0"
1414
plotly = "*"
15+
typing_extensions = "*"
16+
cvxpy = "*"
1517

1618
[tool.poetry.dev-dependencies]
1719
loguru = "*"
1820
pandas = "*"
19-
cvxpy-base = "*"
20-
clarabel = "*"
21+
#cvxpy-base = "*"
22+
#clarabel = "*"
2123

2224
[tool.poetry.group.test.dependencies]
2325
pytest = "*"

0 commit comments

Comments
 (0)