Skip to content

Commit 92f772e

Browse files
authored
Merge branch 'main' into add-update-model-utility
2 parents cf37a8b + 82906ae commit 92f772e

31 files changed

Lines changed: 690 additions & 16 deletions

.coin-or/projDesc.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ Carl D. Laird, Chair, Pyomo Management Committee, claird at andrew dot cmu dot e
157157
<!-- GLPK -->
158158
<!-- </packageName> -->
159159
<!-- <packageURL> -->
160-
<!-- http://www.gnu.org/software/glpk/ -->
161160
<!-- </packageURL> -->
162161
<!-- <requiredOrOptional> -->
163162
<!-- Optional -->

.github/workflows/test_branches.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,13 @@ jobs:
6464
verbose: true
6565
# How many times to retry a failed request (defaults to 1)
6666
retry_count: 3
67-
# Exclude Jenkins because it's behind a firewall; ignore RTD because
68-
# a magically-generated string is triggering a failure
67+
# Exclude:
68+
# - Jenkins because it's behind a firewall
69+
# - RTD because a magically-generated string triggers failures
6970
exclude_urls: https://pyomo-jenkins.sandia.gov/,https://pyomo.readthedocs.io/en/%s/errors.html
71+
# Exclude:
72+
# - All gnu.org links because they consistently fail the checker
73+
exclude_patterns: https://www.gnu.org
7074

7175

7276
build:

.github/workflows/test_pr_and_main.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,13 @@ jobs:
7575
verbose: true
7676
# How many times to retry a failed request (defaults to 1)
7777
retry_count: 3
78-
# Exclude Jenkins because it's behind a firewall; ignore RTD because
79-
# a magically-generated string is triggering a failure
78+
# Exclude:
79+
# - Jenkins because it's behind a firewall
80+
# - RTD because a magically-generated string triggers failures
8081
exclude_urls: https://pyomo-jenkins.sandia.gov/,https://pyomo.readthedocs.io/en/%s/errors.html
82+
# Exclude:
83+
# - All gnu.org links because they consistently fail the checker
84+
exclude_patterns: https://www.gnu.org
8185

8286

8387
build:

.github/workflows/url_check.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ jobs:
3030
# - Jenkins because it's behind a firewall
3131
# - RTD because a magically-generated string triggers failures
3232
exclude_urls: https://pyomo-jenkins.sandia.gov/,https://pyomo.readthedocs.io/en/%s/errors.html
33+
# Exclude:
34+
# - All gnu.org links because they consistently fail the checker
35+
exclude_patterns: https://www.gnu.org

doc/OnlineDocs/explanation/analysis/parmest/driver.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ List of experiment objects
9898
--------------------------
9999

100100
The first argument is a list of experiment objects which is used to
101-
create one labeled model for each expeirment.
101+
create one labeled model for each experiment.
102102
The template :class:`~pyomo.contrib.parmest.experiment.Experiment`
103103
can be used to generate a list of experiment objects.
104104

32.9 KB
Loading
39.7 KB
Loading
24.1 KB
Loading
21.1 KB
Loading
28 KB
Loading

0 commit comments

Comments
 (0)