Skip to content

Commit

Permalink
Merge pull request #3455 from jsiirola/xpress-9.5.1
Browse files Browse the repository at this point in the history 
Testing: exclude Xpress 9.5.1 on Windows/GHA/Python3.{0,1}
  • Loading branch information
@mrmundt
mrmundt authored Jan 16, 2025
2 parents b2cb3ae + e85ec04 commit b0ab851
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 15 deletions.
30 changes: 22 additions & 8 deletions .github/workflows/test_branches.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,29 +71,29 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
python: ['3.13']
python: [3.13]
other: [""]
category: [""]

include:
- os: ubuntu-latest
python: '3.13'
python: 3.13
TARGET: linux
PYENV: pip

- os: macos-latest
python: '3.11'
python: 3.12
TARGET: osx
PYENV: pip

- os: windows-latest
python: 3.9
python: 3.11
TARGET: win
PYENV: conda
PACKAGES: glpk pytest-qt filelock

- os: ubuntu-latest
python: '3.11'
python: 3.11
other: /conda
skip_doctest: 1
TARGET: linux
Expand All @@ -110,7 +110,7 @@ jobs:
PACKAGES: openmpi mpi4py

- os: ubuntu-latest
python: '3.12'
python: 3.12
other: /cython
setup_options: --with-cython
skip_doctest: 1
Expand All @@ -119,7 +119,7 @@ jobs:
PACKAGES: cython

- os: windows-latest
python: '3.10'
python: 3.9
other: /pip
skip_doctest: 1
TARGET: win
Expand Down Expand Up @@ -365,11 +365,23 @@ jobs:
# possibly if it outputs messages to stderr)
conda install --update-deps -q -y $CONDA_DEPENDENCIES
if test -z "${{matrix.slim}}"; then
# xpress.init() (from conda) hangs indefinitely on GHA/Windows under
# Python 3.10 and 3.11. Exclude that release on that platform.
if [[ ${{matrix.TARGET}} == win && ${{matrix.python}} =~ 3.1[01] ]]; then
# We would like to just use something like:
# - "!=9.5.1" (conda errors)
# - "<9.5.1|>9.5.1" (conda installs 9.1.2, which also hangs)
# - "<=9.5.0|>9.5.1" (conda seg faults)
XPRESS='xpress=9.5.0'
else
XPRESS='xpress'
fi
PYVER=$(echo "py${{matrix.python}}" | sed 's/\.//g')
echo "Installing for $PYVER"
for PKG in 'cplex>=12.10' docplex gurobi xpress cyipopt pymumps scip; do
for PKG in 'cplex>=12.10' docplex gurobi "$XPRESS" cyipopt pymumps scip; do
echo ""
echo "*** Install $PKG ***"
echo ""
# conda can literally take an hour to determine that a
# package is not available. Perform a quick search to see
# if the package is available for this interpreter before
Expand All @@ -391,6 +403,7 @@ jobs:
conda install -y "$PKG" || _BUILDS=""
fi
fi
echo ""
if test -z "$_BUILDS"; then
echo "WARNING: $PKG is not available"
fi
Expand Down Expand Up @@ -704,6 +717,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: ${{github.job}}_${{env.GHA_JOBGROUP}}-${{env.GHA_JOBNAME}}
include-hidden-files: true
path: |
.coverage
coverage.xml
Expand Down
26 changes: 19 additions & 7 deletions .github/workflows/test_pr_and_main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python: [ 3.9, '3.10', '3.11', '3.12', '3.13' ]
python: [ 3.9, '3.10', 3.11, 3.12, 3.13 ]
other: [""]
category: [""]

Expand All @@ -87,7 +87,7 @@ jobs:
PACKAGES: glpk pytest-qt filelock

- os: ubuntu-latest
python: '3.11'
python: 3.11
other: /conda
skip_doctest: 1
TARGET: linux
Expand All @@ -104,7 +104,7 @@ jobs:
PACKAGES: openmpi mpi4py

- os: ubuntu-latest
python: '3.12'
python: 3.12
other: /cython
setup_options: --with-cython
skip_doctest: 1
Expand All @@ -120,7 +120,7 @@ jobs:
PYENV: pip

- os: ubuntu-latest
python: '3.11'
python: 3.11
other: /singletest
category: "-m 'neos or importtest'"
skip_doctest: 1
Expand Down Expand Up @@ -397,11 +397,23 @@ jobs:
# possibly if it outputs messages to stderr)
conda install --update-deps -q -y $CONDA_DEPENDENCIES
if test -z "${{matrix.slim}}"; then
# xpress.init() (from conda) hangs indefinitely on GHA/Windows under
# Python 3.10 and 3.11. Exclude that release on that platform.
if [[ ${{matrix.TARGET}} == win && ${{matrix.python}} =~ 3.1[01] ]]; then
# We would like to just use something like:
# - "!=9.5.1" (conda errors)
# - "<9.5.1|>9.5.1" (conda installs 9.1.2, which also hangs)
# - "<=9.5.0|>9.5.1" (conda seg faults)
XPRESS='xpress=9.5.0'
else
XPRESS='xpress'
fi
PYVER=$(echo "py${{matrix.python}}" | sed 's/\.//g')
echo "Installing for $PYVER"
for PKG in 'cplex>=12.10' docplex gurobi xpress cyipopt pymumps scip; do
for PKG in 'cplex>=12.10' docplex gurobi "$XPRESS" cyipopt pymumps scip; do
echo ""
echo "*** Install $PKG ***"
echo ""
# conda can literally take an hour to determine that a
# package is not available. Perform a quick search to see
# if the package is available for this interpreter before
Expand All @@ -423,6 +435,7 @@ jobs:
conda install -y "$PKG" || _BUILDS=""
fi
fi
echo ""
if test -z "$_BUILDS"; then
echo "WARNING: $PKG is not available"
fi
Expand Down Expand Up @@ -654,8 +667,7 @@ jobs:
if: ${{ ! matrix.slim }}
shell: bash
run: |
echo "NOTE: temporarily pinning to highspy pre-release for testing"
$PYTHON_EXE -m pip install --cache-dir cache/pip "highspy>=1.7.1.dev1" \
$PYTHON_EXE -m pip install --cache-dir cache/pip highspy \
|| echo "WARNING: highspy is not available"
- name: Set up coverage tracking
Expand Down

0 comments on commit b0ab851

Please sign in to comment.