Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/test_branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/test_pr_and_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: [""]

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion doc/OnlineDocs/explanation/analysis/iis.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
------
Expand Down
2 changes: 1 addition & 1 deletion pyomo/contrib/iis/mis.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading