Skip to content

PR 3/7: Pyomo utilities and single-step optimization #8

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

Merged
bernalde merged 3 commits into from
May 30, 2026
Merged

PR 3/7: Pyomo utilities and single-step optimization #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38607c8
Add Pyomo utilities and single-step optimization
bernalde Feb 4, 2026
c100fba
Address single-step Pyomo review comments
bernalde May 7, 2026
c271b60
Update Pyomo single-step headers
bernalde May 8, 2026
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: 2 additions & 2 deletions .github/workflows/pr-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ jobs:
run: |
if [ "${{ steps.mode.outputs.mode }}" == "fast" ]; then
echo "Draft PR: Skipping notebook and pyomo tests for fast feedback"
pytest tests/ -n auto -v -m "not notebook and not pyomo"
pytest tests/ -n auto -v -m "not notebook and not pyomo" --ignore=tests/test_pyomo_models

@bernalde bernalde May 30, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nonblocking: Ignoring the whole tests/test_pyomo_models directory here means the non-Pyomo PR job no longer runs tests/test_pyomo_models/test_init.py, and the Pyomo job uses -m "pyomo", so that unmarked initializer/export smoke test is not covered there either. This weakens CI coverage for the optional-package import path added in PR #7. Prefer ignoring only the Pyomo-dependent model/solver test files, or move/mark the initializer test so it is still exercised by one CI job; apply the same pattern to the matching --ignore=tests/test_pyomo_models changes in the other workflows.

else
echo "Ready PR: Running full scipy test suite (excluding notebook and pyomo)"
pytest tests/ -n auto -v -m "not notebook and not pyomo" --cov=lyopronto --cov-report=xml:coverage.xml
pytest tests/ -n auto -v -m "not notebook and not pyomo" --ignore=tests/test_pyomo_models --cov=lyopronto --cov-report=xml:coverage.xml
fi

- name: Upload coverage
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rundocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
pip install -e . --no-build-isolation

- name: Run tests (draft = fast, ready = coverage)
run: pytest tests/ -n auto -v -m "notebook" --cov=lyopronto --cov-report=xml --cov-report=term-missing
run: pytest tests/ -n auto -v -m "notebook" --ignore=tests/test_pyomo_models --cov=lyopronto --cov-report=xml --cov-report=term-missing
# jobs:
# doctests:
# # env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/slow-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ jobs:
if [ "${{ inputs.include_pyomo }}" == "true" ]; then
run_pytest pytest tests/ -n auto -v --cov=lyopronto --cov-report=xml --cov-report=term-missing
else
run_pytest pytest tests/ -n auto -v -m "not pyomo" --cov=lyopronto --cov-report=xml --cov-report=term-missing
run_pytest pytest tests/ -n auto -v -m "not pyomo" --ignore=tests/test_pyomo_models --cov=lyopronto --cov-report=xml --cov-report=term-missing
fi
else
echo "Running ONLY slow tests (marked with @pytest.mark.slow)"
echo "This focuses on optimization tests that take minutes"
if [ "${{ inputs.include_pyomo }}" == "true" ]; then
run_pytest pytest tests/ -n auto -v -m "slow" --cov=lyopronto --cov-report=xml --cov-report=term-missing
else
run_pytest pytest tests/ -n auto -v -m "slow and not pyomo" --cov=lyopronto --cov-report=xml --cov-report=term-missing
run_pytest pytest tests/ -n auto -v -m "slow and not pyomo" --ignore=tests/test_pyomo_models --cov=lyopronto --cov-report=xml --cov-report=term-missing
fi
fi

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Run SciPy tests (excluding Pyomo tests)
run: |
echo "Running SciPy test suite (excluding Pyomo tests)"
pytest tests/ -n auto -v -m "not pyomo" --cov=lyopronto --cov-report=xml --cov-report=term-missing
pytest tests/ -n auto -v -m "not pyomo" --ignore=tests/test_pyomo_models --cov=lyopronto --cov-report=xml --cov-report=term-missing

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
Expand Down
Loading
Loading