From 331ed72e18a02f75f87a3dbea12f6e39e2586770 Mon Sep 17 00:00:00 2001 From: Jed Cunningham <66968678+jedcunningham@users.noreply.github.com> Date: Wed, 27 Apr 2022 13:24:20 -0600 Subject: [PATCH] Add missing licenses and update `.rat-excludes` (#23296) (cherry picked from commit b3396558c4b045bbc15bb3d9ce9a29308cafba78) --- .rat-excludes | 5 +++++ chart/newsfragments/config.toml | 16 ++++++++++++++++ dev/CHERRY_PICK_SUMMARY.txt.jinja2 | 18 ++++++++++++++++++ dev/ISSUE_TEMPLATE.md.jinja2 | 18 ++++++++++++++++++ dev/templates/example_dags_template.txt.jinja2 | 18 ++++++++++++++++++ dev/templates/system_test_template.txt.jinja2 | 18 ++++++++++++++++++ newsfragments/config.toml | 16 ++++++++++++++++ scripts/ci/docker-compose/devcontainer.env | 16 ++++++++++++++++ 8 files changed, 125 insertions(+) diff --git a/.rat-excludes b/.rat-excludes index d3c4ac67aa72a..fa4663ce65188 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -7,6 +7,7 @@ .gitrepo .airflow_db_initialised .airflowignore +.babelrc .coverage .coveragerc .codecov.yml @@ -42,6 +43,7 @@ venv files airflow.iml .gitmodules +scripts/ci/installed_providers.txt # Generated doc files .*html @@ -116,3 +118,6 @@ airflow/www/static/robots.txt # Generated autocomplete files dev/breeze/autocomplete/* + +# Newsfragments are snippets that will be, eventually, consumed into RELEASE_NOTES +newsfragments/* diff --git a/chart/newsfragments/config.toml b/chart/newsfragments/config.toml index 7c83de868db84..b00560d7117c5 100644 --- a/chart/newsfragments/config.toml +++ b/chart/newsfragments/config.toml @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://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. [tool.towncrier] name = "Airflow Helm Chart" filename = "RELEASE_NOTES.rst" diff --git a/dev/CHERRY_PICK_SUMMARY.txt.jinja2 b/dev/CHERRY_PICK_SUMMARY.txt.jinja2 index a382e585f971f..c91f9dd7d148c 100644 --- a/dev/CHERRY_PICK_SUMMARY.txt.jinja2 +++ b/dev/CHERRY_PICK_SUMMARY.txt.jinja2 @@ -1,3 +1,21 @@ +{# + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://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. +-#} --------------------------------------------------------- This is summary of the cherry-picks: diff --git a/dev/ISSUE_TEMPLATE.md.jinja2 b/dev/ISSUE_TEMPLATE.md.jinja2 index d57fb0c6f1ee3..be8fa5d74cb84 100644 --- a/dev/ISSUE_TEMPLATE.md.jinja2 +++ b/dev/ISSUE_TEMPLATE.md.jinja2 @@ -1,3 +1,21 @@ +{# + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://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. +-#} We have a kind request for all the contributors to the latest [{{link_text}}]({{link}}). diff --git a/dev/templates/example_dags_template.txt.jinja2 b/dev/templates/example_dags_template.txt.jinja2 index a8b238402084a..52077a5dc871e 100644 --- a/dev/templates/example_dags_template.txt.jinja2 +++ b/dev/templates/example_dags_template.txt.jinja2 @@ -1,3 +1,21 @@ +{# + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://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. +-#} There is a new design of system tests that was introduced by the [AIP-47](https://cwiki.apache.org/confluence/display/AIRFLOW/AIP-47+New+design+of+Airflow+System+Tests). All current example dags need to be migrated and converted into system tests, so they can be run in the CI process automatically before releases. diff --git a/dev/templates/system_test_template.txt.jinja2 b/dev/templates/system_test_template.txt.jinja2 index 7fa3815c78701..061ec0b384cb6 100644 --- a/dev/templates/system_test_template.txt.jinja2 +++ b/dev/templates/system_test_template.txt.jinja2 @@ -1,3 +1,21 @@ +{# + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://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. +-#} There is a new design of system tests that was introduced by the [AIP-47](https://cwiki.apache.org/confluence/display/AIRFLOW/AIP-47+New+design+of+Airflow+System+Tests). All current system tests need to be migrated, so they can be run in the CI process automatically before releases. diff --git a/newsfragments/config.toml b/newsfragments/config.toml index ab30e3b52b00e..014284c1331be 100644 --- a/newsfragments/config.toml +++ b/newsfragments/config.toml @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://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. [tool.towncrier] name = "Airflow" filename = "../RELEASE_NOTES.rst" diff --git a/scripts/ci/docker-compose/devcontainer.env b/scripts/ci/docker-compose/devcontainer.env index 708b1a5496d8f..3698ac4abe003 100644 --- a/scripts/ci/docker-compose/devcontainer.env +++ b/scripts/ci/docker-compose/devcontainer.env @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://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. HOME= AIRFLOW_CI_IMAGE="ghcr.io/apache/airflow/main/ci/python3.7:latest" ANSWER=