Merge branch 'issue_1214-spdx-enforce'

Author: nerdvegas

.github/scripts/store_benchmark.py

@@ -17,7 +17,7 @@
 MAX_ARTIFACTS = 100
 
 # behave differently outside of github actions, for testing
-in_gh = (os.getenv("IN_GITHUB_WORKFLOW") == "1")
+in_gh = (os.getenv("GITHUB_ACTIONS") == "true")
 
 benchmarking_dir = os.path.join("metrics", "benchmarking")
 artifacts_dir = os.path.join(benchmarking_dir, "artifacts")

.github/workflows/benchmark.yaml

@@ -98,8 +98,6 @@ jobs:
         run: |
           python ./.github/scripts/store_benchmark.py
         working-directory: src
-        env:
-          IN_GITHUB_WORKFLOW: 1
 
       - name: Setup git config
         run: |

.github/workflows/copyright.yaml

@@ -0,0 +1,33 @@
+name: copyright
+on:
+  pull_request:
+    paths:
+      - 'src/**'
+      - '!**.md'
+  push:
+    paths:
+      - 'src/**'
+      - '!**.md'
+
+jobs:
+  main:
+    name: Enforce copyright notices
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 2.7
+
+      - name: Run copyright checker
+        run: |
+          bash ./src/build_utils/license/apply_copyright
+          if [[ "$(git status | grep modified)" != "" ]]; then
+            echo "Some sourcefiles are missing copyright notice!" 1>&2
+            echo "Run ./src/build_utils/license/apply_copyright to apply." 1>&2
+            exit 1
+          fi

src/build_utils/license/apply src/build_utils/license/apply_copyrightsrc/build_utils/license/apply renamed to src/build_utils/license/apply_copyright

@@ -5,6 +5,7 @@
 from __future__ import print_function
 import argparse
 import sys
+import os
 
 
 new_copyright = (
@@ -16,17 +17,26 @@ lines = []
 NO_COPYRIGHT = "NO_COPYRIGHT"
 OTHER_COPYRIGHT = "OTHER_COPYRIGHT"
 
+# just removes some verbosity in workflow so user can more easily see problems
+IN_WORKFLOW = (os.getenv("GITHUB_ACTIONS") == "true")
+
 
 def find_existing_copyright():
+    i_comment_start = None
     i_start = None
 
     for i, line in enumerate(lines):
-        if line.startswith('#') and "Copyright" in line:
-            if "Allan" in line or "Rez" in line:
-                i_start = i
-                break
-            else:
-                return OTHER_COPYRIGHT
+        if line.startswith('#'):
+            if i_comment_start is None:
+                i_comment_start = i
+
+            if "Copyright" in line:
+                if "Rez" in line:
+                    i_start = i_comment_start
+                else:
+                    return OTHER_COPYRIGHT
+        else:
+            i_comment_start = None
 
     if i_start is None:
         return NO_COPYRIGHT
@@ -59,7 +69,8 @@ if __name__ == "__main__":
     result = find_existing_copyright()
 
     if result == OTHER_COPYRIGHT:
-        print("Other copyright, skipping %s" % opts.FILE, file=sys.stderr)
+        if not IN_WORKFLOW:
+            print("Other copyright, skipping %s" % opts.FILE, file=sys.stderr)
         sys.exit(1)
 
     # strip existing copyright
@@ -90,6 +101,9 @@ if __name__ == "__main__":
 
     if not opts.overwrite_file:
         print(new_txt)
+    elif new_txt == txt:
+        if not IN_WORKFLOW:
+            print("(file contents unchanged)")
     else:
         with open(opts.FILE, 'w') as f:
             f.write(new_txt)

src/build_utils/license/change_copyright

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright Contributors to the Rez Project
 
+
 """
 Binds the python PyQt module as a rez package.
 """

src/rez/bind/PyQt.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright Contributors to the Rez Project
 
+
 """
 Binds the python PySide module as a rez package.
 """

src/rez/bind/PySide.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright Contributors to the Rez Project
 
+
 """
 Binds a python module to rez.
 

src/rez/bind/_pymodule.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright Contributors to the Rez Project
 
+
 """
 Utility functions for bind modules.
 """

src/rez/bind/_utils.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright Contributors to the Rez Project
 
+
 """
 Creates the system architecture package.
 """