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

Infrastructure Updates #3175

Merged
merged 7 commits into from
Mar 4, 2024
Merged

Infrastructure Updates #3175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2273282
Try some different stuff to get more printouts
mrmundt Mar 4, 2024
a32c004
Revert to 3.9
mrmundt Mar 4, 2024
ffa594c
Back to 3.10
mrmundt Mar 4, 2024
e446941
Upgrade to macos-13
mrmundt Mar 4, 2024
a4a1fd4
Lower to 2
mrmundt Mar 4, 2024
4ae6a70
Add oversubscribe
mrmundt Mar 4, 2024
42fd802
Change macos for coverage upload as well
mrmundt Mar 4, 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
13 changes: 7 additions & 6 deletions .github/workflows/test_branches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
TARGET: linux
PYENV: pip

- os: macos-latest
- os: macos-13
python: '3.10'
TARGET: osx
PYENV: pip
Expand All @@ -86,7 +86,7 @@ jobs:
PACKAGES: pytest-qt

- os: ubuntu-latest
python: 3.9
python: '3.10'
other: /mpi
mpi: 3
skip_doctest: 1
Expand Down Expand Up @@ -333,10 +333,11 @@ jobs:
CONDA_DEPENDENCIES="$CONDA_DEPENDENCIES $PKG"
fi
done
echo ""
echo "*** Install Pyomo dependencies ***"
# Note: this will fail the build if any installation fails (or
# possibly if it outputs messages to stderr)
conda install --update-deps -q -y $CONDA_DEPENDENCIES
conda install --update-deps -y $CONDA_DEPENDENCIES
if test -z "${{matrix.slim}}"; then
PYVER=$(echo "py${{matrix.python}}" | sed 's/\.//g')
echo "Installing for $PYVER"
Expand Down Expand Up @@ -631,7 +632,7 @@ jobs:
$PYTHON_EXE -c "from pyomo.dataportal.parse_datacmds import \
parse_data_commands; parse_data_commands(data='')"
# Note: if we are testing with openmpi, add '--oversubscribe'
mpirun -np ${{matrix.mpi}} pytest -v \
mpirun -np ${{matrix.mpi}} -oversubscribe pytest -v \
--junit-xml=TEST-pyomo-mpi.xml \
-m "mpi" -W ignore::Warning \
pyomo `pwd`/pyomo-model-libraries
Expand Down Expand Up @@ -708,12 +709,12 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-13, windows-latest]

include:
- os: ubuntu-latest
TARGET: linux
- os: macos-latest
- os: macos-13
TARGET: osx
- os: windows-latest
TARGET: win
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test_pr_and_main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-13, windows-latest]
python: [ 3.8, 3.9, '3.10', '3.11', '3.12' ]
other: [""]
category: [""]
Expand All @@ -69,7 +69,7 @@ jobs:
TARGET: linux
PYENV: pip

- os: macos-latest
- os: macos-13
TARGET: osx
PYENV: pip

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

- os: ubuntu-latest
python: 3.9
python: '3.10'
other: /mpi
mpi: 3
skip_doctest: 1
Expand Down Expand Up @@ -661,7 +661,7 @@ jobs:
$PYTHON_EXE -c "from pyomo.dataportal.parse_datacmds import \
parse_data_commands; parse_data_commands(data='')"
# Note: if we are testing with openmpi, add '--oversubscribe'
mpirun -np ${{matrix.mpi}} pytest -v \
mpirun -np ${{matrix.mpi}} -oversubscribe pytest -v \
--junit-xml=TEST-pyomo-mpi.xml \
-m "mpi" -W ignore::Warning \
pyomo `pwd`/pyomo-model-libraries
Expand Down Expand Up @@ -739,12 +739,12 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-13, windows-latest]

include:
- os: ubuntu-latest
TARGET: linux
- os: macos-latest
- os: macos-13
TARGET: osx
- os: windows-latest
TARGET: win
Expand Down