Updating year in copyright statements and making sure copyright state…

…ment appears in every py file
Pyomo · Nov 4, 2024 · bd8420d · bd8420d
1 parent 895fe84
commit bd8420d
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 23 deletions.
diff --git a/pyomo/contrib/edi/README.md b/pyomo/contrib/edi/README.md
@@ -99,19 +99,3 @@ f.ConstraintList(
     ]
 )
 ```
-
-## Acknowledgement
-
-Pyomo: Python Optimization Modeling Objects  
-Copyright (c) 2008-2023  
-National Technology and Engineering Solutions of Sandia, LLC  
-Under the terms of Contract DE-NA0003525 with National Technology and
-Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
-rights in this software.
-
-Development of this module was conducted as part of the Institute for
-the Design of Advanced Energy Systems (IDAES) with support through the
-Simulation-Based Engineering, Crosscutting Research Program within the
-U.S. Department of Energy’s Office of Fossil Energy and Carbon Management.
-
-This software is distributed under the 3-clause BSD License.
diff --git a/pyomo/contrib/edi/__init__.py b/pyomo/contrib/edi/__init__.py
@@ -1,7 +1,7 @@
 #  ___________________________________________________________________________
 #
 #  Pyomo: Python Optimization Modeling Objects
-#  Copyright (c) 2008-2023
+#  Copyright (c) 2008-2024
 #  National Technology and Engineering Solutions of Sandia, LLC
 #  Under the terms of Contract DE-NA0003525 with National Technology and
 #  Engineering Solutions of Sandia, LLC, the U.S. Government retains certain

diff --git a/pyomo/contrib/edi/blackBoxFunctionModel.py b/pyomo/contrib/edi/blackBoxFunctionModel.py
@@ -1,7 +1,7 @@
 #  ___________________________________________________________________________
 #
 #  Pyomo: Python Optimization Modeling Objects
-#  Copyright (c) 2008-2023
+#  Copyright (c) 2008-2024
 #  National Technology and Engineering Solutions of Sandia, LLC
 #  Under the terms of Contract DE-NA0003525 with National Technology and
 #  Engineering Solutions of Sandia, LLC, the U.S. Government retains certain

diff --git a/pyomo/contrib/edi/examples/__init__.py b/pyomo/contrib/edi/examples/__init__.py
@@ -0,0 +1,16 @@
+#  ___________________________________________________________________________
+#
+#  Pyomo: Python Optimization Modeling Objects
+#  Copyright (c) 2008-2024
+#  National Technology and Engineering Solutions of Sandia, LLC
+#  Under the terms of Contract DE-NA0003525 with National Technology and
+#  Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
+#  rights in this software.
+#
+#  Development of this module was conducted as part of the Institute for
+#  the Design of Advanced Energy Systems (IDAES) with support through the
+#  Simulation-Based Engineering, Crosscutting Research Program within the
+#  U.S. Department of Energy’s Office of Fossil Energy and Carbon Management.
+#
+#  This software is distributed under the 3-clause BSD License.
+#  ___________________________________________________________________________
diff --git a/pyomo/contrib/edi/examples/aircraft_gp.py b/pyomo/contrib/edi/examples/aircraft_gp.py
@@ -1,3 +1,20 @@
+#  ___________________________________________________________________________
+#
+#  Pyomo: Python Optimization Modeling Objects
+#  Copyright (c) 2008-2024
+#  National Technology and Engineering Solutions of Sandia, LLC
+#  Under the terms of Contract DE-NA0003525 with National Technology and
+#  Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
+#  rights in this software.
+#
+#  Development of this module was conducted as part of the Institute for
+#  the Design of Advanced Energy Systems (IDAES) with support through the
+#  Simulation-Based Engineering, Crosscutting Research Program within the
+#  U.S. Department of Energy’s Office of Fossil Energy and Carbon Management.
+#
+#  This software is distributed under the 3-clause BSD License.
+#  ___________________________________________________________________________
+
 # ===========
 # Description
 # ===========

diff --git a/pyomo/contrib/edi/examples/readme_example.py b/pyomo/contrib/edi/examples/readme_example.py
@@ -1,3 +1,20 @@
+#  ___________________________________________________________________________
+#
+#  Pyomo: Python Optimization Modeling Objects
+#  Copyright (c) 2008-2024
+#  National Technology and Engineering Solutions of Sandia, LLC
+#  Under the terms of Contract DE-NA0003525 with National Technology and
+#  Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
+#  rights in this software.
+#
+#  Development of this module was conducted as part of the Institute for
+#  the Design of Advanced Energy Systems (IDAES) with support through the
+#  Simulation-Based Engineering, Crosscutting Research Program within the
+#  U.S. Department of Energy’s Office of Fossil Energy and Carbon Management.
+#
+#  This software is distributed under the 3-clause BSD License.
+#  ___________________________________________________________________________
+
 # =================
 # Import Statements
 # =================

diff --git a/pyomo/contrib/edi/formulation.py b/pyomo/contrib/edi/formulation.py
@@ -1,7 +1,7 @@
 #  ___________________________________________________________________________
 #
 #  Pyomo: Python Optimization Modeling Objects
-#  Copyright (c) 2008-2023
+#  Copyright (c) 2008-2024
 #  National Technology and Engineering Solutions of Sandia, LLC
 #  Under the terms of Contract DE-NA0003525 with National Technology and
 #  Engineering Solutions of Sandia, LLC, the U.S. Government retains certain

diff --git a/pyomo/contrib/edi/tests/__init__.py b/pyomo/contrib/edi/tests/__init__.py
@@ -0,0 +1,16 @@
+#  ___________________________________________________________________________
+#
+#  Pyomo: Python Optimization Modeling Objects
+#  Copyright (c) 2008-2024
+#  National Technology and Engineering Solutions of Sandia, LLC
+#  Under the terms of Contract DE-NA0003525 with National Technology and
+#  Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
+#  rights in this software.
+#
+#  Development of this module was conducted as part of the Institute for
+#  the Design of Advanced Energy Systems (IDAES) with support through the
+#  Simulation-Based Engineering, Crosscutting Research Program within the
+#  U.S. Department of Energy’s Office of Fossil Energy and Carbon Management.
+#
+#  This software is distributed under the 3-clause BSD License.
+#  ___________________________________________________________________________
diff --git a/pyomo/contrib/edi/tests/test_blackbox.py b/pyomo/contrib/edi/tests/test_blackbox.py
@@ -1,7 +1,7 @@
 #  ___________________________________________________________________________
 #
 #  Pyomo: Python Optimization Modeling Objects
-#  Copyright (c) 2008-2023
+#  Copyright (c) 2008-2024
 #  National Technology and Engineering Solutions of Sandia, LLC
 #  Under the terms of Contract DE-NA0003525 with National Technology and
 #  Engineering Solutions of Sandia, LLC, the U.S. Government retains certain

diff --git a/pyomo/contrib/edi/tests/test_docSnippets.py b/pyomo/contrib/edi/tests/test_docSnippets.py
@@ -1,7 +1,7 @@
 #  ___________________________________________________________________________
 #
 #  Pyomo: Python Optimization Modeling Objects
-#  Copyright (c) 2008-2023
+#  Copyright (c) 2008-2024
 #  National Technology and Engineering Solutions of Sandia, LLC
 #  Under the terms of Contract DE-NA0003525 with National Technology and
 #  Engineering Solutions of Sandia, LLC, the U.S. Government retains certain

diff --git a/pyomo/contrib/edi/tests/test_examples.py b/pyomo/contrib/edi/tests/test_examples.py
@@ -1,7 +1,7 @@
 #  ___________________________________________________________________________
 #
 #  Pyomo: Python Optimization Modeling Objects
-#  Copyright (c) 2008-2023
+#  Copyright (c) 2008-2024
 #  National Technology and Engineering Solutions of Sandia, LLC
 #  Under the terms of Contract DE-NA0003525 with National Technology and
 #  Engineering Solutions of Sandia, LLC, the U.S. Government retains certain

diff --git a/pyomo/contrib/edi/tests/test_formulation.py b/pyomo/contrib/edi/tests/test_formulation.py
@@ -1,7 +1,7 @@
 #  ___________________________________________________________________________
 #
 #  Pyomo: Python Optimization Modeling Objects
-#  Copyright (c) 2008-2023
+#  Copyright (c) 2008-2024
 #  National Technology and Engineering Solutions of Sandia, LLC
 #  Under the terms of Contract DE-NA0003525 with National Technology and
 #  Engineering Solutions of Sandia, LLC, the U.S. Government retains certain