Skip to content

Commit 5d96b24

Browse files
jsiirolajsiirola
authored
Merge pull request #3515 from mrmundt/copyright
Update Copyright to 2025
2 parents 7d65d04 + 9eca573 commit 5d96b24

File tree

1,780 files changed

+1787
-1821
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,780 files changed

+1787
-1821
lines changed

Diff for: ‎.git-blame-ignore-revs

+1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,5 @@ ed13c8c65d6c3f56973887744be1c62a5d4756de
4545
363a16a609f519b3edfdfcf40c66d6de7ac135af
4646
d024718991455519e09149ede53a38df1c067abe
4747
017e21ee50d98d8b2f2083e6880f030025ed5378
48+
91972008d109322fc1a3b688333d67def2288625
4849

Diff for: ‎LICENSE.md

+1-1

Diff for: ‎conftest.py

+1-1
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

Diff for: ‎doc/OnlineDocs/conf.py

+2-2
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

Diff for: ‎doc/OnlineDocs/ext/pyomo_autosummary_autoenum.py

+1-1
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

Diff for: ‎doc/OnlineDocs/ext/pyomo_tocref.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/ABCD1.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/ABCD2.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/ABCD3.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/ABCD4.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/ABCD5.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/ABCD6.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/ABCD7.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/ABCD8.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/ABCD9.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/diet1.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/ex.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/import1.tab.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/import2.tab.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/import3.tab.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/import4.tab.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/import5.tab.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/import6.tab.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/import7.tab.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/import8.tab.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param1.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param2.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param2a.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param3.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param3a.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param3b.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param3c.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param4.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param5.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param5a.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param6.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param6a.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param7a.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param7b.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/param8a.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/set1.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/set2.py

+1-1
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

Diff for: ‎doc/OnlineDocs/src/data/set2a.py

+1-1
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)