Skip to content

Commit

Permalink
Merge branch 'kdreports-2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Allen Winter committed Nov 21, 2024
2 parents 0d25ef7 + b8a8f6e commit a084496
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: MIT

name: CI
name: Nightly CI

on:
schedule:
Expand Down
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ci:
exclude: ^(cmake/ECM/|cmake/KDAB/|docs/api/doxygen-awesome.css)
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -21,11 +21,11 @@ repos:
- id: destroyed-symlinks
- id: check-executables-have-shebangs
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v18.1.8
rev: v19.1.3
hooks:
- id: clang-format
- repo: https://github.com/PyCQA/pylint
rev: v3.2.7
rev: v3.3.1
hooks:
- id: pylint
exclude: ^(.cmake-format.py|conan/conanfile.py)
Expand All @@ -46,7 +46,7 @@ repos:
- id: cmake-format
exclude: (.py.cmake|Doxyfile.cmake)
- repo: https://github.com/DavidAnson/markdownlint-cli2
rev: v0.12.0
rev: v0.14.0
hooks:
- id: markdownlint-cli2
files: \.(md|mdown|markdown)$
Expand All @@ -55,7 +55,7 @@ repos:
hooks:
- id: reuse
- repo: https://github.com/scop/pre-commit-shfmt
rev: v3.8.0-1
rev: v3.10.0-1
hooks:
- id: shfmt
- repo: https://github.com/shellcheck-py/shellcheck-py
Expand Down
34 changes: 0 additions & 34 deletions .reuse/dep5

This file was deleted.

46 changes: 46 additions & 0 deletions REUSE.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
version = 1
SPDX-PackageName = "KDReports"
SPDX-PackageSupplier = "<[email protected]>"
SPDX-PackageDownloadLocation = "https://www.github.com/KDAB/KDReports"

#misc source code
[[annotations]]
path = ["**.qrc", "**.ui", "**.xml", "**.csv", "**.bat", "**.ts"]
precedence = "aggregate"
SPDX-FileCopyrightText = "Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>"
SPDX-License-Identifier = "MIT"

#artwork
[[annotations]]
path = ["images/**.png", "images/**.svg", "docs/api/**.png", "pics/**.png", "examples/**/**.png", "examples/**/**.jpg", "python/examples/**/**.jpg", "python/examples/**/**.png", "python/examples-qt6/**.jpg", "python/examples-qt6/**/**.png"]
precedence = "aggregate"
SPDX-FileCopyrightText = "Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>"
SPDX-License-Identifier = "MIT"

#misc documentation
[[annotations]]
path = ["**md", "**.txt", "**.html", "docs/manual/**.pdf"]
precedence = "aggregate"
SPDX-FileCopyrightText = "Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>"
SPDX-License-Identifier = "MIT"

#misc config files
[[annotations]]
path = [".pre-commit-config.yaml", ".codespellrc", ".krazy", ".cmake-format.py", ".clang-format", ".clang-tidy", ".clazy", ".gitignore", ".markdownlint.json", ".pep8", ".pylintrc", ".editorconfig", ".shellcheckrc", "docs/api/Doxyfile.cmake", "distro/**", "REUSE.toml"]
precedence = "aggregate"
SPDX-FileCopyrightText = "Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>"
SPDX-License-Identifier = "BSD-3-Clause"

#3rdparty
[[annotations]]
path = "cmake/ECM/modules/**"
precedence = "aggregate"
SPDX-FileCopyrightText = "The KDE Project"
SPDX-License-Identifier = "BSD-3-Clause"

# doxygen awesome
[[annotations]]
path = "docs/api/doxygen-awesome.css"
precedence = "aggregate"
SPDX-FileCopyrightText = "2021 - 2023 jothepro"
SPDX-License-Identifier = "MIT"

0 comments on commit a084496

Please sign in to comment.