chore: Create separate copyright file

Also correct copyright year.
sandialabs · Jul 10, 2024 · 984e1ee · 984e1ee
1 parent 2598c88
commit 984e1ee
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 58 deletions.
diff --git a/COPYRIGHT.md b/COPYRIGHT.md
@@ -0,0 +1,6 @@
+# Copyright
+
+*Copyright © 2023, National Technology & Engineering Solutions of
+Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with
+NTESS, the U.S. Government retains certain rights in this software.
+All rights reserved.*
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,9 +1,6 @@
-# 3-Clause BSD License
+# BSD 3-Clause "New" or "Revised" License
 
-_Copyright © 2024, National Technology & Engineering Solutions of
-Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with
-NTESS, the U.S. Government retains certain rights in this software.
-All rights reserved._
+Copyright 2023 NTESS.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -14,7 +11,7 @@ met:
 2. Redistributions in binary form must reproduce the above copyright
  notice, this list of conditions and the following disclaimer in the
  documentation and/or other materials provided with the distribution.
-3. Neither the name of Sandia National Laboratories nor the names of its
+3. Neither the name of the copyright holder nor the names of its
  contributors may be used to endorse or promote products derived from
  this software without specific prior written permission.
 
@@ -30,41 +27,14 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+
 ## Third-Party Software
 
 This project also bundles minified third-party software licensed under
 the MIT license.
 
-### Bootstrap
-
-Copyright 2011–2021 The Bootstrap Authors
-(https://github.com/twbs/bootstrap/graphs/contributors)
-
-### Chart.js
-
-Copyright 2020 Chart.js Contributors
-
-### JQuery
-
-Copyright JS Foundation and other contributors
-
-### MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-“Software”), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+* **Bootstrap:** Copyright 2011–2021 The Bootstrap Authors
+ (https://github.com/twbs/bootstrap/graphs/contributors)
+* **Chart.js:** Copyright 2020 Chart.js Contributors
+* **JQuery:** Copyright JS Foundation and other contributors
diff --git a/README.md b/README.md
@@ -1,7 +1,3 @@
-> **WARNING:** *This package is still in the process of being open sourced.
-> Until that work is done and this banner is removed, don't expect anything
-> documented here to be accurate.*
-
 ![Lines of code](https://sloc.xyz/github/sandialabs/shell-logger/?category=code)
 [![codecov](https://codecov.io/gh/sandialabs/shell-logger/branch/master/graph/badge.svg?token=FmDStZ6FVR)](https://codecov.io/gh/sandialabs/shell-logger)
 [![CodeFactor](https://www.codefactor.io/repository/github/sandialabs/shell-logger/badge/master)](https://www.codefactor.io/repository/github/sandialabs/shell-logger/overview/master)
@@ -81,9 +77,9 @@ love to have your help :grinning: Check out our
 
 [contributors]: https://github.com/sandialabs/shell-logger/graphs/contributors
 
-## License
+## License & Copyright
 
-See [LICENSE.md](LICENSE.md).
+See [LICENSE.md](LICENSE.md) and [COPYRIGHT.md](COPYRIGHT.md).
 
 ## Credits
 

diff --git a/example/build_flex.py b/example/build_flex.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """An example of cloning, configuring, building, and installing software."""
 
-# © 2024 National Technology & Engineering Solutions of Sandia, LLC
+# © 2023 National Technology & Engineering Solutions of Sandia, LLC
 # (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
 # U.S. Government retains certain rights in this software.
 

diff --git a/example/hello_world_html.py b/example/hello_world_html.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """A simple example."""
 
-# © 2024 National Technology & Engineering Solutions of Sandia, LLC
+# © 2023 National Technology & Engineering Solutions of Sandia, LLC
 # (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
 # U.S. Government retains certain rights in this software.
 

diff --git a/example/hello_world_html_and_console.py b/example/hello_world_html_and_console.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """A simple example, sending output to the log file and console."""
 
-# © 2024 National Technology & Engineering Solutions of Sandia, LLC
+# © 2023 National Technology & Engineering Solutions of Sandia, LLC
 # (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
 # U.S. Government retains certain rights in this software.
 

diff --git a/example/hello_world_html_with_stats.py b/example/hello_world_html_with_stats.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """A simple example, capturing various system statistics."""
 
-# © 2024 National Technology & Engineering Solutions of Sandia, LLC
+# © 2023 National Technology & Engineering Solutions of Sandia, LLC
 # (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
 # U.S. Government retains certain rights in this software.
 

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 To install, simply ``python3 -m pip install .`` in the repository root.
 """
 
-# © 2024 National Technology & Engineering Solutions of Sandia, LLC
+# © 2023 National Technology & Engineering Solutions of Sandia, LLC
 # (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
 # U.S. Government retains certain rights in this software.
 

diff --git a/shell_logger/__init__.py b/shell_logger/__init__.py
@@ -1,6 +1,6 @@
 """The ``shell_logger`` package."""
 
-# © 2024 National Technology & Engineering Solutions of Sandia, LLC
+# © 2023 National Technology & Engineering Solutions of Sandia, LLC
 # (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
 # U.S. Government retains certain rights in this software.
 

diff --git a/shell_logger/abstract_method.py b/shell_logger/abstract_method.py
@@ -1,6 +1,6 @@
 """Provides the :class:`AbstractMethod` exception."""
 
-# © 2024 National Technology & Engineering Solutions of Sandia, LLC
+# © 2023 National Technology & Engineering Solutions of Sandia, LLC
 # (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
 # U.S. Government retains certain rights in this software.
 

diff --git a/shell_logger/html_utilities.py b/shell_logger/html_utilities.py
@@ -1,6 +1,6 @@
 """Various utilities for building the HTML log file."""
 
-# © 2024 National Technology & Engineering Solutions of Sandia, LLC
+# © 2023 National Technology & Engineering Solutions of Sandia, LLC
 # (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
 # U.S. Government retains certain rights in this software.
 

diff --git a/shell_logger/shell.py b/shell_logger/shell.py
@@ -1,6 +1,6 @@
 """Provides the :class:`Shell` class."""
 
-# © 2024 National Technology & Engineering Solutions of Sandia, LLC
+# © 2023 National Technology & Engineering Solutions of Sandia, LLC
 # (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
 # U.S. Government retains certain rights in this software.
 

diff --git a/shell_logger/shell_logger.py b/shell_logger/shell_logger.py
@@ -1,6 +1,6 @@
 """Provides the :class:`ShellLogger` class, along with some helpers."""
 
-# © 2024 National Technology & Engineering Solutions of Sandia, LLC
+# © 2023 National Technology & Engineering Solutions of Sandia, LLC
 # (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
 # U.S. Government retains certain rights in this software.
 

diff --git a/shell_logger/stats_collector.py b/shell_logger/stats_collector.py
@@ -1,6 +1,6 @@
 """Provides the various means of collecting machine statistics."""
 
-# © 2024 National Technology & Engineering Solutions of Sandia, LLC
+# © 2023 National Technology & Engineering Solutions of Sandia, LLC
 # (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
 # U.S. Government retains certain rights in this software.
 

diff --git a/shell_logger/trace.py b/shell_logger/trace.py
@@ -1,6 +1,6 @@
 """Provides the means of collecting various trace data."""
 
-# © 2024 National Technology & Engineering Solutions of Sandia, LLC
+# © 2023 National Technology & Engineering Solutions of Sandia, LLC
 # (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
 # U.S. Government retains certain rights in this software.
 

diff --git a/test/test_shell_logger.py b/test/test_shell_logger.py
@@ -1,6 +1,6 @@
 """The unit test suite for the ``shell_logger`` package."""
 
-# © 2024 National Technology & Engineering Solutions of Sandia, LLC
+# © 2023 National Technology & Engineering Solutions of Sandia, LLC
 # (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
 # U.S. Government retains certain rights in this software.