Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge main #116

Merged
merged 15 commits into from
Jun 25, 2024
Merged

merge main #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c7f9f4d
Bump pytest from 8.2.1 to 8.2.2
dependabot[bot] Jun 10, 2024
3471bb5
Merge pull request #109 from cvxgrp/dependabot/pip/pytest-8.2.2
tschm Jun 11, 2024
ffb1866
Update basic.yml
tschm Jun 16, 2024
c159266
Update test_frontier.py
tschm Jun 16, 2024
be9a03f
Update test_frontier.py
tschm Jun 16, 2024
3bb218a
Merge pull request #110 from cvxgrp/tschm-patch-1
tschm Jun 16, 2024
607cb01
Bump cvxpy from 1.5.1 to 1.5.2
dependabot[bot] Jun 24, 2024
ecfba44
Update ci.yml
tschm Jun 25, 2024
efb9b02
Merge pull request #113 from cvxgrp/tschm-patch-2
tschm Jun 25, 2024
6e2a54a
testing
tschm Jun 25, 2024
bacd80a
fmt
tschm Jun 25, 2024
a5317ce
Merge pull request #112 from cvxgrp/dependabot/pip/cvxpy-1.5.2
tschm Jun 25, 2024
17c44fe
Update pyproject.toml
tschm Jun 25, 2024
0f1ad87
clarabel
tschm Jun 25, 2024
4118838
Merge pull request #115 from cvxgrp/tschm-patch-2
tschm Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: cvxgrp/.github/actions/test@main
with:
python-version: '3.10'
- uses: cvxgrp/.github/actions/coverage@main

- name: Coveralls GitHub Action
uses: coverallsapp/github-action@v2
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ jobs:
matrix:
# mosek is not yet ready for '3.11'
os: [ ubuntu-latest, windows-latest, macos-latest ]
python-version: ['3.9', '3.10', '3.11' ]
python-version: ['3.9', '3.10', '3.11', '3.12' ]
exclude:
- os: windows-latest
python-version: '3.12'

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
Loading
Loading