From e3eb54be3c0a0c4cd324384ca84de21c6138ddf9 Mon Sep 17 00:00:00 2001 From: Oliver Stolz <73951934+OliverStolzBO@users.noreply.github.com> Date: Mon, 26 Feb 2024 10:47:32 +0100 Subject: [PATCH 1/4] Adjust paths to execute workflows for (#42) --- .github/workflows/code_coverage.yml | 4 +++- .github/workflows/lint.yml | 4 +++- .github/workflows/tests.yml | 8 -------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index fde9ace..3b5224c 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -7,6 +7,7 @@ on: paths: - 'pfdl_scheduler/**' - 'tests/**' + - 'requirements.txt' - '.github/workflows/**' pull_request: branches: @@ -14,6 +15,7 @@ on: 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 \ No newline at end of file + coverage html diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3ed209f..e780ff5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,6 +7,7 @@ on: paths: - 'pfdl_scheduler/**' - 'tests/**' + - 'ci_lint_runner.py' - '.github/workflows/**' pull_request: branches: @@ -14,6 +15,7 @@ on: paths: - 'pfdl_scheduler/**' - 'tests/**' + - 'ci_lint_runner.py' - '.github/workflows/**' permissions: @@ -37,4 +39,4 @@ jobs: - name: Run Lint check run: | python3 ci_lint_runner.py pfdl_scheduler 8 - python3 ci_lint_runner.py tests 8 \ No newline at end of file + python3 ci_lint_runner.py tests 8 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4443306..8dab097 100644 --- 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 From 8b865d61ade7b275254f3cf18a42a8e24642462e Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Mon, 26 Feb 2024 10:51:45 +0100 Subject: [PATCH 2/4] Add copyright and license information (#43) Adds license information to parser and grammar. --- .reuse/dep5 | 4 ++++ pfdl_scheduler/parser/PFDLLexer.py.license | 2 ++ pfdl_scheduler/parser/PFDLParser.py.license | 2 ++ pfdl_scheduler/parser/PFDLParserVisitor.py.license | 2 ++ 4 files changed, 10 insertions(+) create mode 100644 pfdl_scheduler/parser/PFDLLexer.py.license create mode 100644 pfdl_scheduler/parser/PFDLParser.py.license create mode 100644 pfdl_scheduler/parser/PFDLParserVisitor.py.license diff --git a/.reuse/dep5 b/.reuse/dep5 index 25afeb1..960ba3f 100644 --- 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 new file mode 100644 index 0000000..6c15ccb --- /dev/null +++ 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 new file mode 100644 index 0000000..6c15ccb --- /dev/null +++ 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 new file mode 100644 index 0000000..6c15ccb --- /dev/null +++ b/pfdl_scheduler/parser/PFDLParserVisitor.py.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: The PFDL Contributors +SPDX-License-Identifier: MIT From eeb7a81ad2cb853b1b26cae18d3fd2294046f801 Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Mon, 26 Feb 2024 11:39:53 +0100 Subject: [PATCH 3/4] Add licensing and copyright information (#44) --- pfdl_scheduler/utils/log_entry_observer.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pfdl_scheduler/utils/log_entry_observer.py b/pfdl_scheduler/utils/log_entry_observer.py index 529d08c..b4723b5 100644 --- 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 From c3aaf157517d4433c34af6691178297bd6a0cc10 Mon Sep 17 00:00:00 2001 From: Oliver Stolz <73951934+OliverStolzBO@users.noreply.github.com> Date: Thu, 29 Feb 2024 08:45:38 +0100 Subject: [PATCH 4/4] Always execute lint check (#47) Ensure that the lint check is always performed on push and pull-requests on main. This fixes the corresponding mandatory check being stuck. --- .github/workflows/lint.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e780ff5..4a086b9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,19 +4,9 @@ on: push: branches: - 'main' - paths: - - 'pfdl_scheduler/**' - - 'tests/**' - - 'ci_lint_runner.py' - - '.github/workflows/**' pull_request: branches: - 'main' - paths: - - 'pfdl_scheduler/**' - - 'tests/**' - - 'ci_lint_runner.py' - - '.github/workflows/**' permissions: contents: read