From 86854c7bd1a17bc77e49d6ab1b4a1ed5b264c8a6 Mon Sep 17 00:00:00 2001 From: John Siirola Date: Mon, 8 Dec 2025 10:13:21 -0700 Subject: [PATCH 1/8] Switch from HTTPS -> HTTP due to carleton.ca certificate issues --- doc/OnlineDocs/explanation/analysis/iis.rst | 2 +- pyomo/contrib/iis/mis.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From 11b49921b01581029f4c0c8a1469e588bda2b35e Mon Sep 17 00:00:00 2001 From: John Siirola Date: Mon, 8 Dec 2025 10:14:04 -0700 Subject: [PATCH 2/8] Switch 'merged PRs' count badge from yellow to green --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From e6072012067b5bfefd08f0bc4347f425a23235d1 Mon Sep 17 00:00:00 2001 From: blnicho Date: Mon, 8 Dec 2025 16:32:45 -0700 Subject: [PATCH 3/8] Test workaround for openmpi issue --- .github/workflows/test_branches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml index 530ab9cc4e1..c1627c0a39c 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=*=*external_* mpi4py - os: ubuntu-latest python: 3.12 From dc1baf9e98c6116f6e52f34f092b0fce33f939e1 Mon Sep 17 00:00:00 2001 From: blnicho Date: Mon, 8 Dec 2025 16:37:55 -0700 Subject: [PATCH 4/8] Test workaround for openmpi issue --- .github/workflows/test_branches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml index c1627c0a39c..b7127d815df 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=*=*external_* mpi4py + PACKAGES: openmpi!=*=*external_* mpi4py - os: ubuntu-latest python: 3.12 From fdb0d60bb53aa955119adb35605354d6ae216c43 Mon Sep 17 00:00:00 2001 From: blnicho Date: Mon, 8 Dec 2025 16:50:34 -0700 Subject: [PATCH 5/8] Test workaround for openmpi issue --- .github/workflows/test_branches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml index b7127d815df..c4151aebd54 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!=*=*external_* mpi4py + PACKAGES: openmpi==*[build=h*] mpi4py - os: ubuntu-latest python: 3.12 From 2ea13c1362c5e2746c05676ac44e5e9265cad8b0 Mon Sep 17 00:00:00 2001 From: blnicho Date: Tue, 9 Dec 2025 11:39:26 -0700 Subject: [PATCH 6/8] Be more specific about openmpi build --- .github/workflows/test_pr_and_main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_pr_and_main.yml b/.github/workflows/test_pr_and_main.yml index 59924f6d0e1..0ab4766bc95 100644 --- a/.github/workflows/test_pr_and_main.yml +++ b/.github/workflows/test_pr_and_main.yml @@ -128,7 +128,7 @@ jobs: mpi: 3 TARGET: linux PYENV: conda - PACKAGES: openmpi mpi4py + PACKAGES: openmpi==*[build=h*] mpi4py - os: ubuntu-latest python: 3.12 From 642d5053e50e3226ada9505d4eb4bb2f9114964d Mon Sep 17 00:00:00 2001 From: John Siirola Date: Tue, 9 Dec 2025 13:55:59 -0700 Subject: [PATCH 7/8] Pin Python 3.14.0 until 3.14.1 is removed from runner images --- .github/workflows/test_pr_and_main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_pr_and_main.yml b/.github/workflows/test_pr_and_main.yml index 0ab4766bc95..65d93f77816 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: [""] From 847c5025c8884de5f46fe5f5c7fa1514f2099788 Mon Sep 17 00:00:00 2001 From: John Siirola Date: Tue, 9 Dec 2025 17:28:38 -0700 Subject: [PATCH 8/8] Update coverage job to macos-latest --- .github/workflows/test_branches.yml | 4 ++-- .github/workflows/test_pr_and_main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml index c4151aebd54..e5af7e5cbe5 100644 --- a/.github/workflows/test_branches.yml +++ b/.github/workflows/test_branches.yml @@ -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 65d93f77816..62814d904fa 100644 --- a/.github/workflows/test_pr_and_main.yml +++ b/.github/workflows/test_pr_and_main.yml @@ -885,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