Merge pull request #143 from sandialabs/update-license

chore: Update LICENSE/COPYRIGHT info
sandialabs · Jul 4, 2024 · 24af9f8 · 24af9f8
2 parents d9ec314 + aae82e5
commit 24af9f8
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 22 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 © 2023–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.
 

diff --git a/README.md b/README.md
@@ -85,9 +85,9 @@ we'd love to have your help :grinning:  Check out our
 
 [contributors]: https://github.com/sandialabs/reverse_argparse/graphs/contributors
 
-## License
+## License & Copyright
 
-See [LICENSE.md](LICENSE.md).
+See [LICENSE.md](LICENSE.md) and [COPYRIGHT.md](COPYRIGHT.md).
 
 ## Credits
 

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -14,8 +14,7 @@
 
 project = "reverse_argparse"
 copyright = (  # noqa: A001
-    "2023–2024, National Technology & Engineering Solutions "  # noqa: RUF001
-    "of Sandia, LLC (NTESS)"
+    "2023, National Technology & Engineering Solutions of Sandia, LLC (NTESS)"
 )
 author = "Jason M. Gates"
 version = "1.0.8"

diff --git a/example/basic.py b/example/basic.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """Basic ``reverse_argparse`` functionality."""
 
-# © 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/default_values.py b/example/default_values.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """How ``reverse_argparse`` handles default values."""
 
-# © 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/post_processing.py b/example/post_processing.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """How ``reverse_argparse`` handles post-processing of arguments."""
 
-# © 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/pretty_printing.py b/example/pretty_printing.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """``reverse_argparse`` pretty-printing functionality."""
 
-# © 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/relative_references.py b/example/relative_references.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """How ``reverse_argparse`` handles relative references."""
 
-# © 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/subparsers.py b/example/subparsers.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """How ``reverse_argparse`` handles subparsers."""
 
-# © 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/test_examples.py b/example/test_examples.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """Run all the examples and ensure their output is correct."""
 
-# © 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/reverse_argparse/__init__.py b/reverse_argparse/__init__.py
@@ -5,7 +5,7 @@
 :func:`quote_arg_if_necessary` helper function.
 """
 
-# © 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/reverse_argparse/reverse_argparse.py b/reverse_argparse/reverse_argparse.py
@@ -7,7 +7,7 @@
 with spaces in them with quotes.
 """
 
-# © 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/test/__init__.py b/test/__init__.py
@@ -6,7 +6,7 @@
 directory.
 """
 
-# © 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_reverse_argparse.py b/test/test_reverse_argparse.py
@@ -1,6 +1,6 @@
 """The unit test suite for the ``reverse_argparse`` 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.