Skip to content

Commit

Permalink
Merge pull request #127 from cvxgrp/deptry
Browse files Browse the repository at this point in the history
Update basic.yml
  • Loading branch information
tschm authored Oct 27, 2024
2 parents 0e98fb8 + adc7d46 commit 34883b0
Show file tree
Hide file tree
Showing 7 changed files with 345 additions and 162 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,9 @@ jobs:
with:
files: artifacts/tests/coverage/coverage.info
format: lcov

deptry:
runs-on: ubuntu-latest

steps:
- uses: cvxgrp/.github/actions/deptry@main
2 changes: 1 addition & 1 deletion cvx/cla/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from cvx.cla.markowitz.cla import CLA
from .markowitz.cla import CLA
4 changes: 2 additions & 2 deletions cvx/cla/claux.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

import numpy as np

from cvx.cla.first import init_algo
from cvx.cla.types import MATRIX, Frontier, FrontierPoint, TurningPoint
from .first import init_algo
from .types import MATRIX, Frontier, FrontierPoint, TurningPoint


@dataclass(frozen=True)
Expand Down
2 changes: 1 addition & 1 deletion cvx/cla/first.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import cvxpy as cp
import numpy as np

from cvx.cla.types import MATRIX, TurningPoint
from .types import MATRIX, TurningPoint


#
Expand Down
4 changes: 2 additions & 2 deletions cvx/cla/markowitz/cla.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

import numpy as np

from cvx.cla.claux import CLAUX
from cvx.cla.types import TurningPoint
from ..claux import CLAUX
from ..types import TurningPoint


@dataclass(frozen=True)
Expand Down
483 changes: 329 additions & 154 deletions poetry.lock

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ python = ">=3.9,<3.12"
numpy = "*"
scipy = ">=1.10.0"
plotly = "*"
typing_extensions = "*"
cvxpy = "*"

[tool.poetry.dev-dependencies]
loguru = "*"
pandas = "*"
cvxpy-base = "*"
clarabel = "*"
#cvxpy-base = "*"
#clarabel = "*"

[tool.poetry.group.test.dependencies]
pytest = "*"
Expand Down

0 comments on commit 34883b0

Please sign in to comment.