Merge branch 'main' into MIT

iml130 · Feb 29, 2024 · 4a50629 · 4a50629
2 parents b1f110b + c3aaf15
commit 4a50629
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml
@@ -7,13 +7,15 @@ on:
     paths:
       - 'pfdl_scheduler/**'
       - 'tests/**'
+      - 'requirements.txt'
       - '.github/workflows/**'
   pull_request:
     branches:
       - 'main'
     paths:
       - 'pfdl_scheduler/**'
       - 'tests/**'
+      - 'requirements.txt'
       - '.github/workflows/**'
 
 permissions:
@@ -42,4 +44,4 @@ jobs:
             coverage run --omit=tests/*,pfdl_scheduler/parser/PFDL* -m unittest discover -s tests/unit_test
             coverage report
             coverage json
-            coverage html
+            coverage html
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -4,17 +4,9 @@ on:
   push:
     branches:
       - 'main'
-    paths:
-      - 'pfdl_scheduler/**'
-      - 'tests/**'
-      - '.github/workflows/**'
   pull_request:
     branches:
       - 'main'
-    paths:
-      - 'pfdl_scheduler/**'
-      - 'tests/**'
-      - '.github/workflows/**'
 
 permissions:
   contents: read
@@ -37,4 +29,4 @@ jobs:
       - name: Run Lint check
         run: |
           python3 ci_lint_runner.py pfdl_scheduler 8
-          python3 ci_lint_runner.py tests 8
+          python3 ci_lint_runner.py tests 8
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -4,17 +4,9 @@ on:
   push:
     branches:
       - 'main'
-    paths:
-      - 'pfdl_scheduler/**'
-      - 'tests/**'
-      - '.github/workflows/**'
   pull_request:
     branches:
       - 'main'
-    paths:
-      - 'pfdl_scheduler/**'
-      - 'tests/**'
-      - '.github/workflows/**'
 
 permissions:
   contents: read

diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -6,3 +6,7 @@ Source: https://github.com/iml130/pfd
 Files: docs/img/*
 Copyright: The PFDL Contributors
 License: CC-BY-4.0
+
+Files: pfdl_grammar/*
+Copyright: The PFDL Contributors
+License: MIT
diff --git a/pfdl_scheduler/parser/PFDLLexer.py.license b/pfdl_scheduler/parser/PFDLLexer.py.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: The PFDL Contributors
+SPDX-License-Identifier: MIT
diff --git a/pfdl_scheduler/parser/PFDLParser.py.license b/pfdl_scheduler/parser/PFDLParser.py.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: The PFDL Contributors
+SPDX-License-Identifier: MIT
diff --git a/pfdl_scheduler/parser/PFDLParserVisitor.py.license b/pfdl_scheduler/parser/PFDLParserVisitor.py.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: The PFDL Contributors
+SPDX-License-Identifier: MIT
diff --git a/pfdl_scheduler/utils/log_entry_observer.py b/pfdl_scheduler/utils/log_entry_observer.py
@@ -1,3 +1,9 @@
+# Copyright The PFDL Contributors
+#
+# Licensed under the MIT License.
+# For details on the licensing terms, see the LICENSE file.
+# SPDX-License-Identifier: MIT
+
 """This module provides the LogEntryObserver which implements the Observer pattern.
 
 The scheduler notifies about log entries, so this class is used to catch these
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		SPDX-FileCopyrightText: The PFDL Contributors
		SPDX-License-Identifier: MIT