You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2023/08/19 07:54:38 UTC
[airflow] branch main updated: Move license templates out of repo root (#33515)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new f89af2163f Move license templates out of repo root (#33515)
f89af2163f is described below
commit f89af2163fdc907aac8ebb9d1d0ddadf6e5c4806
Author: Jed Cunningham <66...@users.noreply.github.com>
AuthorDate: Sat Aug 19 01:54:31 2023 -0600
Move license templates out of repo root (#33515)
---
.pre-commit-config.yaml | 22 +++++++++++-----------
.../ci/license-templates}/LICENSE.rst | 0
.../ci/license-templates}/LICENSE.txt | 0
...it_check_providers_subpackages_all_have_init.py | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1c8feab070..cb0545eddf 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -52,7 +52,7 @@ repos:
- --comment-style
- "/*||*/"
- --license-filepath
- - license-templates/LICENSE.txt
+ - scripts/ci/license-templates/LICENSE.txt
- --fuzzy-match-generates-todo
- id: insert-license
name: Add license for all RST files
@@ -61,7 +61,7 @@ repos:
- --comment-style
- "||"
- --license-filepath
- - license-templates/LICENSE.rst
+ - scripts/ci/license-templates/LICENSE.rst
- --fuzzy-match-generates-todo
files: \.rst$
- id: insert-license
@@ -72,7 +72,7 @@ repos:
- --comment-style
- "/*!| *| */"
- --license-filepath
- - license-templates/LICENSE.txt
+ - scripts/ci/license-templates/LICENSE.txt
- --fuzzy-match-generates-todo
- id: insert-license
name: Add license for all JINJA template files
@@ -82,7 +82,7 @@ repos:
- --comment-style
- "{#||#}"
- --license-filepath
- - license-templates/LICENSE.txt
+ - scripts/ci/license-templates/LICENSE.txt
- --fuzzy-match-generates-todo
- id: insert-license
name: Add license for all Shell files
@@ -92,7 +92,7 @@ repos:
- --comment-style
- "|#|"
- --license-filepath
- - license-templates/LICENSE.txt
+ - scripts/ci/license-templates/LICENSE.txt
- --fuzzy-match-generates-todo
- id: insert-license
name: Add license for all Python files
@@ -102,7 +102,7 @@ repos:
- --comment-style
- "|#|"
- --license-filepath
- - license-templates/LICENSE.txt
+ - scripts/ci/license-templates/LICENSE.txt
- --fuzzy-match-generates-todo
- id: insert-license
name: Add license for all XML files
@@ -112,7 +112,7 @@ repos:
- --comment-style
- "<!--||-->"
- --license-filepath
- - license-templates/LICENSE.txt
+ - scripts/ci/license-templates/LICENSE.txt
- --fuzzy-match-generates-todo
- id: insert-license
name: Add license for all Helm template files
@@ -121,7 +121,7 @@ repos:
- --comment-style
- "{{/*||*/}}"
- --license-filepath
- - license-templates/LICENSE.txt
+ - scripts/ci/license-templates/LICENSE.txt
- --fuzzy-match-generates-todo
- id: insert-license
name: Add license for all YAML files except Helm templates
@@ -132,7 +132,7 @@ repos:
- --comment-style
- "|#|"
- --license-filepath
- - license-templates/LICENSE.txt
+ - scripts/ci/license-templates/LICENSE.txt
- --fuzzy-match-generates-todo
- id: insert-license
name: Add license for all Markdown files
@@ -142,7 +142,7 @@ repos:
- --comment-style
- "<!--|| -->"
- --license-filepath
- - license-templates/LICENSE.txt
+ - scripts/ci/license-templates/LICENSE.txt
- --fuzzy-match-generates-todo
- id: insert-license
name: Add license for all other files
@@ -151,7 +151,7 @@ repos:
- --comment-style
- "|#|"
- --license-filepath
- - license-templates/LICENSE.txt
+ - scripts/ci/license-templates/LICENSE.txt
- --fuzzy-match-generates-todo
files: >
\.cfg$|\.conf$|\.ini$|\.ldif$|\.properties$|\.readthedocs$|\.service$|\.tf$|Dockerfile.*$
diff --git a/license-templates/LICENSE.rst b/scripts/ci/license-templates/LICENSE.rst
similarity index 100%
rename from license-templates/LICENSE.rst
rename to scripts/ci/license-templates/LICENSE.rst
diff --git a/license-templates/LICENSE.txt b/scripts/ci/license-templates/LICENSE.txt
similarity index 100%
rename from license-templates/LICENSE.txt
rename to scripts/ci/license-templates/LICENSE.txt
diff --git a/scripts/ci/pre_commit/pre_commit_check_providers_subpackages_all_have_init.py b/scripts/ci/pre_commit/pre_commit_check_providers_subpackages_all_have_init.py
index 0d491ad91f..f06425a92b 100755
--- a/scripts/ci/pre_commit/pre_commit_check_providers_subpackages_all_have_init.py
+++ b/scripts/ci/pre_commit/pre_commit_check_providers_subpackages_all_have_init.py
@@ -33,7 +33,7 @@ def check_dir_init_file(provider_files: list[str]) -> None:
missing_init_dirs.append(path)
if missing_init_dirs:
- with open(os.path.join(ROOT_DIR, "license-templates/LICENSE.txt")) as license:
+ with open(os.path.join(ROOT_DIR, "scripts/ci/license-templates/LICENSE.txt")) as license:
license_txt = license.readlines()
prefixed_licensed_txt = [f"# {line}" if line != "\n" else "#\n" for line in license_txt]