readme and irods logo updates

.github/workflows/image-push.yml

@@ -1,6 +1,6 @@
-# BSD 3-Clause License All rights reserved.
+# BSD 3-Clause All rights reserved.
 #
-# SPDX-License-Identifier: BSD 3-Clause License
+# SPDX-License-Identifier: BSD 3-Clause
 
 name: Build and publish the docker image
 

.github/workflows/pylint.yml

@@ -1,6 +1,6 @@
-# BSD 3-Clause License All rights reserved.
+# BSD 3-Clause All rights reserved.
 #
-# SPDX-License-Identifier: BSD 3-Clause License
+# SPDX-License-Identifier: BSD 3-Clause
 
 name: PyLint the codebase
 

.gitignore

@@ -1,6 +1,6 @@
-# BSD 3-Clause License All rights reserved.
+# BSD 3-Clause All rights reserved.
 #
-# SPDX-License-Identifier: BSD 3-Clause License
+# SPDX-License-Identifier: BSD 3-Clause
 
 /src/common/__pycache__/
 /src/staging/__pycache__/

.pylintrc

@@ -1,6 +1,6 @@
-# BSD 3-Clause License All rights reserved.
+# BSD 3-Clause All rights reserved.
 #
-# SPDX-License-Identifier: BSD 3-Clause License
+# SPDX-License-Identifier: BSD 3-Clause
 
 [MASTER]
 init-hook='import sys; sys.path.append("./")'

Dockerfile

@@ -1,6 +1,6 @@
-# BSD 3-Clause License All rights reserved.
+# BSD 3-Clause All rights reserved.
 #
-# SPDX-License-Identifier: BSD 3-Clause License
+# SPDX-License-Identifier: BSD 3-Clause
 
 # This Dockerfile is used to build the iRODS-K8s-Staging image
 

LICENSE

@@ -1,29 +1,11 @@
-BSD 3-Clause License
+Copyright (c) 2024, The University of North Carolina at Chapel Hill All rights reserved.
 
-Copyright (c) 2024, The University of North Carolina at Chapel Hill
-All rights reserved.
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
+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.
 
-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 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.
 
-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.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF 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.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 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.

README.md

@@ -1,7 +1,7 @@
 <!--
-BSD 3-Clause License All rights reserved.
+BSD 3-Clause All rights reserved.
 
-SPDX-License-Identifier: BSD 3-Clause License
+SPDX-License-Identifier: BSD 3-Clause
 -->
 
 [![iRODS](iRODS-Logo.png)](https://docs.irods.org)

main.py

@@ -1,6 +1,6 @@
-# BSD 3-Clause License All rights reserved.
+# BSD 3-Clause All rights reserved.
 #
-# SPDX-License-Identifier: BSD 3-Clause License
+# SPDX-License-Identifier: BSD 3-Clause
 
 """
     Main entry point for the staging microservice application

requirements.txt

@@ -1,6 +1,6 @@
-# BSD 3-Clause License All rights reserved.
+# BSD 3-Clause All rights reserved.
 #
-# SPDX-License-Identifier: BSD 3-Clause License
+# SPDX-License-Identifier: BSD 3-Clause
 
 psycopg2-binary==2.9.9
 pylint==3.1.0

src/common/logger.py

@@ -1,6 +1,6 @@
-# BSD 3-Clause License All rights reserved.
+# BSD 3-Clause All rights reserved.
 #
-# SPDX-License-Identifier: BSD 3-Clause License
+# SPDX-License-Identifier: BSD 3-Clause
 
 """
     Logger methods for all components

src/common/pg_impl.py

@@ -1,6 +1,6 @@
-# BSD 3-Clause License All rights reserved.
+# BSD 3-Clause All rights reserved.
 #
-# SPDX-License-Identifier: BSD 3-Clause License
+# SPDX-License-Identifier: BSD 3-Clause
 
 """
     Class for database functionalities

src/common/pg_utils_multi.py

@@ -1,6 +1,6 @@
-# BSD 3-Clause License All rights reserved.
+# BSD 3-Clause All rights reserved.
 #
-# SPDX-License-Identifier: BSD 3-Clause License
+# SPDX-License-Identifier: BSD 3-Clause
 
 """
     Base class for database functionalities

src/common/staging_enums.py

@@ -1,6 +1,6 @@
-# BSD 3-Clause License All rights reserved.
+# BSD 3-Clause All rights reserved.
 #
-# SPDX-License-Identifier: BSD 3-Clause License
+# SPDX-License-Identifier: BSD 3-Clause
 
 """
     Class enums for the project

src/staging/staging.py

@@ -1,6 +1,6 @@
-# BSD 3-Clause License All rights reserved.
+# BSD 3-Clause All rights reserved.
 #
-# SPDX-License-Identifier: BSD 3-Clause License
+# SPDX-License-Identifier: BSD 3-Clause
 
 """
     Main entry point for the staging microservice application

src/tests/test_staging.py

@@ -1,6 +1,6 @@
-# BSD 3-Clause License All rights reserved.
+# BSD 3-Clause All rights reserved.
 #
-# SPDX-License-Identifier: BSD 3-Clause License
+# SPDX-License-Identifier: BSD 3-Clause
 
 """
     Job supervisor tests.