Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Run tests with coverage
env:
version: 10.0.0
version: 10.0.2

on:
push:
Expand All @@ -10,6 +10,7 @@ on:
types: [opened, synchronize, reopened, ready_for_review]
branches:
- 'master'
merge_group:

jobs:

Expand Down
20 changes: 18 additions & 2 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
name: Integration test

env:
version: 10.0.0
version: 10.0.2

on:
push:
pull_request:
branches:
- 'master'
merge_group:
workflow_dispatch:


jobs:

Integration-test:
if: github.event_name != 'pull_request'
runs-on: ubuntu-22.04
strategy:
fail-fast: true
Expand Down Expand Up @@ -43,6 +45,7 @@ jobs:
run: pytest -nauto

Windows-test:
if: github.event_name != 'pull_request'
env:
SCIPOPTDIR: C:\scipoptdir
runs-on: windows-latest
Expand Down Expand Up @@ -85,6 +88,7 @@ jobs:
run: pytest -nauto

MacOS-test:
if: github.event_name != 'pull_request'
runs-on: macos-latest
strategy:
matrix:
Expand Down Expand Up @@ -128,6 +132,18 @@ jobs:
# export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${{ github.workspace }}/scipoptsuite/lib
# pytest

integration-gate:
if: always()
needs: [Integration-test, Windows-test, MacOS-test]
runs-on: ubuntu-latest
steps:
- name: Check integration test results
run: |
echo "Results: ${{ join(needs.*.result, ', ') }}"
if ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}; then
exit 1
fi

### if you need valgrind on mac, you can install it via
# brew tap LouisBrunner/valgrind
# brew install --HEAD LouisBrunner/valgrind/valgrind
2 changes: 1 addition & 1 deletion .github/workflows/stubs.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Check type stubs
env:
version: 10.0.0
version: 10.0.2

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-release.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: TestPyPI release

env:
version: 10.0.0
version: 10.0.2


# runs only when a release is published, not on drafts
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/update-packages-and-documentation.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Test and Release PyPI Package

env:
version: 10.0.0
version: 10.0.2


# runs only when a release is published, not on drafts
Expand Down Expand Up @@ -38,7 +38,7 @@ jobs:

- name: Install dependencies (SCIPOptSuite)
run: |
wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/$(echo "v${{env.version}}" | tr -d '.')/scipoptsuite_${{ env.version }}-1+jammy_amd64.deb
wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/v${{ env.version }}/scipoptsuite_${{ env.version }}-1+jammy_amd64.deb
sudo apt-get update && sudo apt install -y ./scipoptsuite_${{ env.version }}-1+jammy_amd64.deb

- name: Setup python ${{ matrix.python-version }}
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:

- name: Install dependencies (SCIPOptSuite)
run: |
wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/$(echo "v${{env.version}}" | tr -d '.')/scipoptsuite_${{ env.version }}-1+jammy_amd64.deb
wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/v${{ env.version }}/scipoptsuite_${{ env.version }}-1+jammy_amd64.deb
sudo apt-get update && sudo apt install -y ./scipoptsuite_${{ env.version }}-1+jammy_amd64.deb

- name: Setup python 3
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Replace Python math with C-level math functions and refactor unary expressions (#1224)
- Speed up `ProdExpr.__neg__` and `Constant.__neg__` via C-level API (#1250)
- Extended `structured_optimization_trace` recipe to support context-managed JSONL tracing with final `run_end` records, alongside the existing attach-style in-memory tracing.
- Integration tests now run in the merge queue before merging instead of after pushing to `master` (#1249)
### Removed
- `SumExpr`.coefs has been removed; its values were always 1.0 (#1258)

Expand Down
Loading