Skip to content

Commit

Permalink
Update license headers and fix pre-commit (#112)
Browse files Browse the repository at this point in the history
* Update license headers and fix pre-commit

* Revert proto.py and added in files

* Fix self review findings

* Fix self review findings

* Fix self reveiw findings

* Fix self review findings

* Gitignore, action version etc

* Fix 3rd notice...

* Update license header to 2024

Signed-off-by: Dennis Meister <[email protected]>

* Update license header to 2024

Signed-off-by: Dennis Meister <[email protected]>

* PR review findings

Signed-off-by: Dennis Meister <[email protected]>

---------

Signed-off-by: Dennis Meister <[email protected]>
Co-authored-by: Dennis Meister <[email protected]>
  • Loading branch information
kse3hi and dennismeister93 authored Jan 11, 2024
1 parent 22043a7 commit 5504400
Show file tree
Hide file tree
Showing 158 changed files with 337 additions and 298 deletions.
2 changes: 1 addition & 1 deletion .dapr/components/pubsub.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .dapr/config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022-2023 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/configure-proxies.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/container-set.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/postCreateCommand.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2022-2023 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
# https://www.apache.org/licenses/LICENSE-2.0.
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# SPDX-License-Identifier: Apache-2.0

name: 🐞 Bug Report
description: Provide a general summary of the bug in the title below.
title: "[Bug]: "
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
# https://www.apache.org/licenses/LICENSE-2.0.
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# SPDX-License-Identifier: Apache-2.0

name: 🛠️ Feature Request
description: Suggest an idea to help us improve our product.
title: "[Feature]: "
Expand Down
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/question.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
# https://www.apache.org/licenses/LICENSE-2.0.
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# SPDX-License-Identifier: Apache-2.0

name: ❓ Question or general issue
description: Approach us with a question
title: "[Q]: "
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/pre-commit-action/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022-2023 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-licenses.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down Expand Up @@ -27,10 +27,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Clone License Check Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: eclipse-velocitas/license-check
ref: v1.2.3
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022-2023 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down Expand Up @@ -39,10 +39,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: "pip"
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
run: tox

- name: Publish Unit Test Results
uses: mikepenz/action-junit-report@v3
uses: mikepenz/action-junit-report@v4
if: always()
with:
report_paths: ./results/UnitTest/junit.xml
Expand All @@ -79,7 +79,7 @@ jobs:
annotate_only: true

- name: ReportGenerator
uses: danielpalme/ReportGenerator-GitHub-Action@5.1.23
uses: danielpalme/ReportGenerator-GitHub-Action@5.2.0
with:
reports: "./results/CodeCoverage/cobertura-coverage.xml" # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported.
targetdir: "." # REQUIRED # The directory where the generated report should be saved.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/project-creation.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023 Robert Bosch GmbH
# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down Expand Up @@ -38,7 +38,7 @@ jobs:
fail-fast: false

steps:
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand All @@ -25,10 +25,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"

Expand Down
14 changes: 0 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
# https://www.apache.org/licenses/LICENSE-2.0.
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# SPDX-License-Identifier: Apache-2.0

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
2 changes: 1 addition & 1 deletion .licensechecker.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .ort.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
72 changes: 47 additions & 25 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down Expand Up @@ -88,6 +88,12 @@ repos:
rev: 1.7.5
hooks:
- id: bandit
exclude: >
(?x)^(
.*_pb2.py|
.*_pb2.pyi|
.*_pb2_grpc.py
)$
args: ["--skip=B101"]
types_or: [python]

Expand Down Expand Up @@ -116,27 +122,43 @@ repos:
.*_pb2_grpc.py
)$
# - repo: https://github.com/Lucas-C/pre-commit-hooks
# rev: v1.3.1
# hooks:
# - id: insert-license
# files: '.*\.(py|pyi|yaml|yml|sh|helmignore|dockerignore|gitignore)$'
# args:
# - --license-filepath
# - license_header.txt
# - --comment-style
# - "#"
# - id: insert-license
# files: '.*\.(proto)$'
# args:
# - --license-filepath
# - license_header.txt
# - --comment-style
# - //
# - id: insert-license
# files: "Dockerfile.*"
# args:
# - --license-filepath
# - license_header.txt
# - --comment-style
# - "#"
- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.5.4
hooks:
- id: insert-license
files: '.*\.(py|pyi|yaml|yml|sh|in)$'
exclude: >
(?x)^(
.*_pb2.py|
.*_pb2.pyi|
.*_pb2_grpc.py
)$
args:
- --license-filepath
- license_header.txt
- --comment-style
- "#"
- --use-current-year
- --allow-past-years
- --skip-license-insertion-comment=This file is maintained by velocitas CLI, do not modify manually.
- id: insert-license
files: '.*\.(proto)$'
args:
- --license-filepath
- license_header.txt
- --comment-style
- //
- --use-current-year
- --allow-past-years
- --skip-license-insertion-comment=This file is maintained by velocitas CLI, do not modify manually.
- --skip-license-insertion-comment=!/bin/bash
- id: insert-license
files: "Dockerfile.*"
args:
- --license-filepath
- license_header.txt
- --comment-style
- "#"
- --use-current-year
- --allow-past-years
- --skip-license-insertion-comment=This file is maintained by velocitas CLI, do not modify manually.
2 changes: 1 addition & 1 deletion .project-creation/.skeleton/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
14 changes: 14 additions & 0 deletions .project-creation/.skeleton/requirements.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
# https://www.apache.org/licenses/LICENSE-2.0.
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# SPDX-License-Identifier: Apache-2.0

grpcio==1.59.0
protobuf==4.24.4
dapr==1.11.0
Expand Down
2 changes: 1 addition & 1 deletion .project-creation/.skeleton/src/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .project-creation/.skeleton/src/main.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022-2023 Contributors to the Eclipse Foundation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .project-creation/.skeleton/src/vapp.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .project-creation/.skeleton/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .project-creation/.skeleton/tests/integration/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
Loading

0 comments on commit 5504400

Please sign in to comment.