Skip to content

Commit b0ab851

Browse files
mrmundtmrmundt
authored
Merge pull request #3455 from jsiirola/xpress-9.5.1
Testing: exclude Xpress 9.5.1 on Windows/GHA/Python3.{0,1}
2 parents b2cb3ae + e85ec04 commit b0ab851

File tree

2 files changed

+41
-15
lines changed

2 files changed

+41
-15
lines changed

‎.github/workflows/test_branches.yml‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,29 +71,29 @@ jobs:
7171
fail-fast: false
7272
matrix:
7373
os: [ubuntu-latest]
74-
python: ['3.13']
74+
python: [3.13]
7575
other: [""]
7676
category: [""]
7777

7878
include:
7979
- os: ubuntu-latest
80-
python: '3.13'
80+
python: 3.13
8181
TARGET: linux
8282
PYENV: pip
8383

8484
- os: macos-latest
85-
python: '3.11'
85+
python: 3.12
8686
TARGET: osx
8787
PYENV: pip
8888

8989
- os: windows-latest
90-
python: 3.9
90+
python: 3.11
9191
TARGET: win
9292
PYENV: conda
9393
PACKAGES: glpk pytest-qt filelock
9494

9595
- os: ubuntu-latest
96-
python: '3.11'
96+
python: 3.11
9797
other: /conda
9898
skip_doctest: 1
9999
TARGET: linux
@@ -110,7 +110,7 @@ jobs:
110110
PACKAGES: openmpi mpi4py
111111

112112
- os: ubuntu-latest
113-
python: '3.12'
113+
python: 3.12
114114
other: /cython
115115
setup_options: --with-cython
116116
skip_doctest: 1
@@ -119,7 +119,7 @@ jobs:
119119
PACKAGES: cython
120120

121121
- os: windows-latest
122-
python: '3.10'
122+
python: 3.9
123123
other: /pip
124124
skip_doctest: 1
125125
TARGET: win
@@ -365,11 +365,23 @@ jobs:
365365
# possibly if it outputs messages to stderr)
366366
conda install --update-deps -q -y $CONDA_DEPENDENCIES
367367
if test -z "${{matrix.slim}}"; then
368+
# xpress.init() (from conda) hangs indefinitely on GHA/Windows under
369+
# Python 3.10 and 3.11. Exclude that release on that platform.
370+
if [[ ${{matrix.TARGET}} == win && ${{matrix.python}} =~ 3.1[01] ]]; then
371+
# We would like to just use something like:
372+
# - "!=9.5.1" (conda errors)
373+
# - "<9.5.1|>9.5.1" (conda installs 9.1.2, which also hangs)
374+
# - "<=9.5.0|>9.5.1" (conda seg faults)
375+
XPRESS='xpress=9.5.0'
376+
else
377+
XPRESS='xpress'
378+
fi
368379
PYVER=$(echo "py${{matrix.python}}" | sed 's/\.//g')
369380
echo "Installing for $PYVER"
370-
for PKG in 'cplex>=12.10' docplex gurobi xpress cyipopt pymumps scip; do
381+
for PKG in 'cplex>=12.10' docplex gurobi "$XPRESS" cyipopt pymumps scip; do
371382
echo ""
372383
echo "*** Install $PKG ***"
384+
echo ""
373385
# conda can literally take an hour to determine that a
374386
# package is not available. Perform a quick search to see
375387
# if the package is available for this interpreter before
@@ -391,6 +403,7 @@ jobs:
391403
conda install -y "$PKG" || _BUILDS=""
392404
fi
393405
fi
406+
echo ""
394407
if test -z "$_BUILDS"; then
395408
echo "WARNING: $PKG is not available"
396409
fi
@@ -704,6 +717,7 @@ jobs:
704717
uses: actions/upload-artifact@v4
705718
with:
706719
name: ${{github.job}}_${{env.GHA_JOBGROUP}}-${{env.GHA_JOBNAME}}
720+
include-hidden-files: true
707721
path: |
708722
.coverage
709723
coverage.xml

‎.github/workflows/test_pr_and_main.yml‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
fail-fast: false
6969
matrix:
7070
os: [ubuntu-latest, macos-latest, windows-latest]
71-
python: [ 3.9, '3.10', '3.11', '3.12', '3.13' ]
71+
python: [ 3.9, '3.10', 3.11, 3.12, 3.13 ]
7272
other: [""]
7373
category: [""]
7474

@@ -87,7 +87,7 @@ jobs:
8787
PACKAGES: glpk pytest-qt filelock
8888

8989
- os: ubuntu-latest
90-
python: '3.11'
90+
python: 3.11
9191
other: /conda
9292
skip_doctest: 1
9393
TARGET: linux
@@ -104,7 +104,7 @@ jobs:
104104
PACKAGES: openmpi mpi4py
105105

106106
- os: ubuntu-latest
107-
python: '3.12'
107+
python: 3.12
108108
other: /cython
109109
setup_options: --with-cython
110110
skip_doctest: 1
@@ -120,7 +120,7 @@ jobs:
120120
PYENV: pip
121121

122122
- os: ubuntu-latest
123-
python: '3.11'
123+
python: 3.11
124124
other: /singletest
125125
category: "-m 'neos or importtest'"
126126
skip_doctest: 1
@@ -397,11 +397,23 @@ jobs:
397397
# possibly if it outputs messages to stderr)
398398
conda install --update-deps -q -y $CONDA_DEPENDENCIES
399399
if test -z "${{matrix.slim}}"; then
400+
# xpress.init() (from conda) hangs indefinitely on GHA/Windows under
401+
# Python 3.10 and 3.11. Exclude that release on that platform.
402+
if [[ ${{matrix.TARGET}} == win && ${{matrix.python}} =~ 3.1[01] ]]; then
403+
# We would like to just use something like:
404+
# - "!=9.5.1" (conda errors)
405+
# - "<9.5.1|>9.5.1" (conda installs 9.1.2, which also hangs)
406+
# - "<=9.5.0|>9.5.1" (conda seg faults)
407+
XPRESS='xpress=9.5.0'
408+
else
409+
XPRESS='xpress'
410+
fi
400411
PYVER=$(echo "py${{matrix.python}}" | sed 's/\.//g')
401412
echo "Installing for $PYVER"
402-
for PKG in 'cplex>=12.10' docplex gurobi xpress cyipopt pymumps scip; do
413+
for PKG in 'cplex>=12.10' docplex gurobi "$XPRESS" cyipopt pymumps scip; do
403414
echo ""
404415
echo "*** Install $PKG ***"
416+
echo ""
405417
# conda can literally take an hour to determine that a
406418
# package is not available. Perform a quick search to see
407419
# if the package is available for this interpreter before
@@ -423,6 +435,7 @@ jobs:
423435
conda install -y "$PKG" || _BUILDS=""
424436
fi
425437
fi
438+
echo ""
426439
if test -z "$_BUILDS"; then
427440
echo "WARNING: $PKG is not available"
428441
fi
@@ -654,8 +667,7 @@ jobs:
654667
if: ${{ ! matrix.slim }}
655668
shell: bash
656669
run: |
657-
echo "NOTE: temporarily pinning to highspy pre-release for testing"
658-
$PYTHON_EXE -m pip install --cache-dir cache/pip "highspy>=1.7.1.dev1" \
670+
$PYTHON_EXE -m pip install --cache-dir cache/pip highspy \
659671
|| echo "WARNING: highspy is not available"
660672
661673
- name: Set up coverage tracking

0 commit comments

Comments
 (0)