diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml index 530ab9cc4e1..e5af7e5cbe5 100644 --- a/.github/workflows/test_branches.yml +++ b/.github/workflows/test_branches.yml @@ -119,7 +119,7 @@ jobs: mpi: 3 TARGET: linux PYENV: conda - PACKAGES: openmpi mpi4py + PACKAGES: openmpi==*[build=h*] mpi4py - os: ubuntu-latest python: 3.12 @@ -831,12 +831,12 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-13, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] include: - os: ubuntu-latest TARGET: linux - - os: macos-13 + - os: macos-latest TARGET: osx - os: windows-latest TARGET: win diff --git a/.github/workflows/test_pr_and_main.yml b/.github/workflows/test_pr_and_main.yml index 59924f6d0e1..62814d904fa 100644 --- a/.github/workflows/test_pr_and_main.yml +++ b/.github/workflows/test_pr_and_main.yml @@ -93,7 +93,8 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python: [ '3.10', 3.11, 3.12, 3.13, 3.14 ] + # FIXME: pinning to 3.14.0 until 3.14.1 is removed from runner tool cache + python: [ '3.10', 3.11, 3.12, 3.13, 3.14.0 ] other: [""] category: [""] @@ -128,7 +129,7 @@ jobs: mpi: 3 TARGET: linux PYENV: conda - PACKAGES: openmpi mpi4py + PACKAGES: openmpi==*[build=h*] mpi4py - os: ubuntu-latest python: 3.12 @@ -884,12 +885,12 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-13, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] include: - os: ubuntu-latest TARGET: linux - - os: macos-13 + - os: macos-latest TARGET: osx - os: windows-latest TARGET: win diff --git a/README.md b/README.md index 362fc88e142..409aa5bee06 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Documentation Status](https://readthedocs.org/projects/pyomo/badge/?version=latest)](https://pyomo.readthedocs.org/en/latest/) [![Build services](https://github.com/Pyomo/jenkins-status/blob/main/pyomo_services.svg)](https://pyomo-jenkins.sandia.gov/) [![GitHub contributors](https://img.shields.io/github/contributors/pyomo/pyomo.svg)](https://github.com/pyomo/pyomo/graphs/contributors) -[![Merged PRs](https://img.shields.io/github/issues-pr-closed-raw/pyomo/pyomo.svg?label=merged+PRs)](https://github.com/pyomo/pyomo/pulls?q=is:pr+is:merged) +[![Merged PRs](https://img.shields.io/github/issues-pr-closed-raw/pyomo/pyomo.svg?label=merged+PRs&color=44cc11)](https://github.com/pyomo/pyomo/pulls?q=is:pr+is:merged) [![a COIN-OR project](https://www.coin-or.org/GitHub/coin-or-badge.png)](https://www.coin-or.org) diff --git a/doc/OnlineDocs/explanation/analysis/iis.rst b/doc/OnlineDocs/explanation/analysis/iis.rst index 773560c4e28..7c31f5ff087 100644 --- a/doc/OnlineDocs/explanation/analysis/iis.rst +++ b/doc/OnlineDocs/explanation/analysis/iis.rst @@ -37,7 +37,7 @@ as part of the watertap project (https://github.com/watertap-org/watertap) and is therefore governed by a license shown at the top of ``mis.py``. -The algorithms come from John Chinneck's slides, see: https://www.sce.carleton.ca/faculty/chinneck/docs/CPAIOR07InfeasibilityTutorial.pdf +The algorithms come from John Chinneck's slides, see: http://www.sce.carleton.ca/faculty/chinneck/docs/CPAIOR07InfeasibilityTutorial.pdf Solver ------ diff --git a/pyomo/contrib/iis/mis.py b/pyomo/contrib/iis/mis.py index 12f3ec91ec1..c804e0c5ca6 100644 --- a/pyomo/contrib/iis/mis.py +++ b/pyomo/contrib/iis/mis.py @@ -31,7 +31,7 @@ copied by DLW 18Feb2024 and edited -See: https://www.sce.carleton.ca/faculty/chinneck/docs/CPAIOR07InfeasibilityTutorial.pdf +See: http://www.sce.carleton.ca/faculty/chinneck/docs/CPAIOR07InfeasibilityTutorial.pdf """ import logging