Skip to content
This repository has been archived by the owner on Oct 2, 2024. It is now read-only.

update copyright for HPSF #1916

Merged
merged 6 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Charliecloud is copyright © Triad National Security, LLC and others.

This software was produced in part under U.S. Government contract
89233218CNA000001 for Los Alamos National Laboratory (LANL), which is operated
by Triad National Security, LLC for the U.S. Department of Energy/National
Nuclear Security Administration.

The Government is granted for itself and others acting on its behalf a
nonexclusive, paid-up, irrevocable worldwide license in this material to
reproduce, prepare derivative works, distribute copies to the public, perform
publicly and display publicly, and to permit others to do so.

Neither the government nor Triad National Security, LLC makes any warranty,
express or implied, or assumes any liability for use of this software.

If software is modified to produce derivative works, such derivative works
should be clearly marked, so as not to confuse it with the version available
from LANL.

LA-CC 14-096
31 changes: 7 additions & 24 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -135,32 +135,15 @@ Other publications:
Supercomputing*. DOI: `10.1145/3624062.3624585
<https://doi.org/10.1145/3624062.3624585>`_.

Copyright and license
---------------------

Charliecloud is copyright © 2014–2023 Triad National Security, LLC and others.

This software was produced under U.S. Government contract 89233218CNA000001
for Los Alamos National Laboratory (LANL), which is operated by Triad National
Security, LLC for the U.S. Department of Energy/National Nuclear Security
Administration.

This is open source software (LA-CC 14-096); you can redistribute it and/or
modify it under the terms of the Apache License, Version 2.0. A copy is
included in file LICENSE. You may not use this software except in compliance
with the license.

The Government is granted for itself and others acting on its behalf a
nonexclusive, paid-up, irrevocable worldwide license in this material to
reproduce, prepare derivative works, distribute copies to the public, perform
publicly and display publicly, and to permit others to do so.
License and intellectual property
---------------------------------

Neither the government nor Triad National Security, LLC makes any warranty,
express or implied, or assumes any liability for use of this software.
Charliecloud is open source software; you can redistribute it and/or modify it
under the terms of the Apache License, Version 2.0. A copy is included in file
LICENSE. You may not use this software except in compliance with the license.

If software is modified to produce derivative works, such derivative works
should be clearly marked, so as not to confuse it with the version available
from LANL.
Copyrights and patents are retained by contributors. No copyright assignment
is required to contribute to Charliecloud.


.. LocalWords: USENIX's CNA Meisam figshare
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

# General information about the project.
project = u'Charliecloud'
copyright = u'2014–2023, Triad National Security, LLC and others'
copyright = u'Charliecloud a Series of LF Projects, LLC and others (web content and website). For web site terms of use, trademark policy and other project policies please see: https://lfprojects.org'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down
2 changes: 2 additions & 0 deletions misc/loc
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ patch
plain text
filter remove_matches TEXT_HAS_NO_COMMENTS_BUT_A_FILTER_IS_REQUIRED
extension txt
filename NOTICE
filename PERUSEME
filename README
filename VERSION
Expand Down Expand Up @@ -257,6 +258,7 @@ countem "TEST SUITE & EXAMPLES" /tmp/loc.test
# documentation
find . -type f -a \( \
-path './doc/*.rst' \
-o -path ./NOTICE \
-o -path ./README.rst \
-o -path ./doc/conf.py \
-o -path ./doc/make-deps-overview \
Expand Down