Skip to content

Commit d234c37

Browse files
mrmundtmrmundt
committed
Merge in main; resolve conflicts
2 parents 14511dd + 5d96b24 commit d234c37

File tree

1,777 files changed

+1799
-1846
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,777 files changed

+1799
-1846
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,5 @@ ed13c8c65d6c3f56973887744be1c62a5d4756de
4545
363a16a609f519b3edfdfcf40c66d6de7ac135af
4646
d024718991455519e09149ede53a38df1c067abe
4747
017e21ee50d98d8b2f2083e6880f030025ed5378
48+
91972008d109322fc1a3b688333d67def2288625
4849

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion

‎conftest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2008-2024
4+
# Copyright (c) 2008-2025
55
# National Technology and Engineering Solutions of Sandia, LLC
66
# Under the terms of Contract DE-NA0003525 with National Technology and
77
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain

‎doc/OnlineDocs/conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2008-2024
4+
# Copyright (c) 2008-2025
55
# National Technology and Engineering Solutions of Sandia, LLC
66
# Under the terms of Contract DE-NA0003525 with National Technology and
77
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
@@ -107,7 +107,7 @@
107107

108108
# General information about the project.
109109
project = u'Pyomo'
110-
copyright = u'2008-2024, Sandia National Laboratories'
110+
copyright = u'2008-2025, Sandia National Laboratories'
111111
author = u'Pyomo Development Team'
112112

113113
# The version info for the project you're documenting, acts as replacement for

‎doc/OnlineDocs/ext/pyomo_autosummary_autoenum.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2008-2024
4+
# Copyright (c) 2008-2025
55
# National Technology and Engineering Solutions of Sandia, LLC
66
# Under the terms of Contract DE-NA0003525 with National Technology and
77
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain

‎doc/OnlineDocs/ext/pyomo_tocref.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2008-2024
4+
# Copyright (c) 2008-2025
55
# National Technology and Engineering Solutions of Sandia, LLC
66
# Under the terms of Contract DE-NA0003525 with National Technology and
77
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain

‎doc/OnlineDocs/src/data/ABCD1.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2008-2024
4+
# Copyright (c) 2008-2025
55
# National Technology and Engineering Solutions of Sandia, LLC
66
# Under the terms of Contract DE-NA0003525 with National Technology and
77
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain

‎doc/OnlineDocs/src/data/ABCD2.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2008-2024
4+
# Copyright (c) 2008-2025
55
# National Technology and Engineering Solutions of Sandia, LLC
66
# Under the terms of Contract DE-NA0003525 with National Technology and
77
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain

‎doc/OnlineDocs/src/data/ABCD3.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2008-2024
4+
# Copyright (c) 2008-2025
55
# National Technology and Engineering Solutions of Sandia, LLC
66
# Under the terms of Contract DE-NA0003525 with National Technology and
77
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain

‎doc/OnlineDocs/src/data/ABCD4.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ___________________________________________________________________________
22
#
33
# Pyomo: Python Optimization Modeling Objects
4-
# Copyright (c) 2008-2024
4+
# Copyright (c) 2008-2025
55
# National Technology and Engineering Solutions of Sandia, LLC
66
# Under the terms of Contract DE-NA0003525 with National Technology and
77
# Engineering Solutions of Sandia, LLC, the U.S. Government retains certain

0 commit comments

Comments
 (0)