Skip to content

Commit

Permalink
fix typo and path to licences folder (#40067)
Browse files Browse the repository at this point in the history
(cherry picked from commit fcb9f87)

Update commands hashs
  • Loading branch information
uzhastik authored and ephraimbuddy committed Jul 2, 2024
1 parent 23ca6fa commit 0467c41
Show file tree
Hide file tree
Showing 11 changed files with 75 additions and 76 deletions.
8 changes: 4 additions & 4 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ Third party Apache 2.0 licenses

The following components are provided under the Apache 2.0 License.
See project link for details. The text of each license is also included
at licenses/LICENSE-[project].txt.
at 3rd-party-licenses/LICENSE-[project].txt.

(ALv2 License) hue v4.3.0 (https://github.com/cloudera/hue/)
(ALv2 License) jqclock v2.3.0 (https://github.com/JohnRDOrazio/jQuery-Clock-Plugin)
Expand All @@ -227,7 +227,7 @@ MIT licenses
========================================================================

The following components are provided under the MIT License. See project link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.
The text of each license is also included at 3rd-party-licenses/LICENSE-[project].txt.

(MIT License) jquery v3.5.1 (https://jquery.org/license/)
(MIT License) dagre-d3 v0.6.4 (https://github.com/cpettitt/dagre-d3)
Expand All @@ -243,11 +243,11 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
BSD 3-Clause licenses
========================================================================
The following components are provided under the BSD 3-Clause license. See project links for details.
The text of each license is also included at licenses/LICENSE-[project].txt.
The text of each license is also included at 3rd-party-licenses/LICENSE-[project].txt.

(BSD 3 License) d3 v5.16.0 (https://d3js.org)
(BSD 3 License) d3-shape v2.1.0 (https://github.com/d3/d3-shape)
(BSD 3 License) cgroupspy 0.2.1 (https://github.com/cloudsigma/cgroupspy)

========================================================================
See licenses/LICENSES-ui.txt for packages used in `/airflow/www`
See 3rd-party-licenses/LICENSES-ui.txt for packages used in `/airflow/www`
7 changes: 3 additions & 4 deletions airflow/_vendor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ All Vendored libraries must follow these rules:
1. Vendored libraries must be pure Python--no compiling (so that we do not have to release multi-platform airflow packages on PyPI).
2. Source code for the library is included in this directory.
3. License must be included in this repo and in the [LICENSE](../../LICENSE) file and in the
[licenses](../../licenses) folder.
[licenses](../../3rd-party-licenses) folder.
4. Requirements of the library become requirements of airflow core.
5. Version of the library should be included in the [vendor.md](vendor.md) file.
6. No modifications to the library may be made in the initial commit.
Expand All @@ -25,13 +25,12 @@ All Vendored libraries must follow these rules:

Way to vendor a library or update a version:

1. Update ``vendor.txt`` with the library, version, and SHA256 (`pypi` provides hashes as of recently)
1. Update ``vendor.md`` with the library, version, and SHA256 (`pypi` provides hashes as of recently)
2. Remove all old files and directories of the old version.
3. Replace them with new files (only replace relevant python packages:move LICENSE )
* move license files to [licenses](../../licenses) folder
* move license files to [licenses](../../3rd-party-licenses) folder
* remove README and any other supporting files (they can be found in PyPI)
* make sure to add requirements to airflow's ``pyproject.toml`` with appropriate comment stating
why the requirements are added and when they should be removed
4. If you replace previous version, re-apply historical fixes from the "package" folder by
cherry-picking them.

42 changes: 21 additions & 21 deletions dev/breeze/doc/images/output-commands.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 14 additions & 14 deletions dev/breeze/doc/images/output_build-docs.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion dev/breeze/doc/images/output_build-docs.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7391d7b5a523f63bb02bea9ca23216dd
4d4224036d347ea305bad22c33182643
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0511f7776390562cef3934433b84e495
d65ffab4b292b7b91ea8b3f806927d1f
28 changes: 14 additions & 14 deletions dev/breeze/doc/images/output_release-management_publish-docs.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a6be6aad28ce6b74e0b3d075b03aabc4
8db4846fe61c3124616add3984d0b1ff
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ def start_airflow(
"--package-list",
envvar="PACKAGE_LIST",
type=str,
help="Optional, contains comma-seperated list of package ids that are processed for documentation "
help="Optional, contains comma-separated list of package ids that are processed for documentation "
"building, and document publishing. It is an easier alternative to adding individual packages as"
" arguments to every command. This overrides the packages passed as arguments.",
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ def basic_provider_checks(provider_package_id: str) -> dict[str, Any]:
"--package-list",
envvar="PACKAGE_LIST",
type=str,
help="Optional, contains comma-seperated list of package ids that are processed for documentation "
help="Optional, contains comma-separated list of package ids that are processed for documentation "
"building, and document publishing. It is an easier alternative to adding individual packages as"
" arguments to every command. This overrides the packages passed as arguments.",
)
Expand Down Expand Up @@ -1523,7 +1523,7 @@ def run_publish_docs_in_parallel(
"--package-list",
envvar="PACKAGE_LIST",
type=str,
help="Optional, contains comma-seperated list of package ids that are processed for documentation "
help="Optional, contains comma-separated list of package ids that are processed for documentation "
"building, and document publishing. It is an easier alternative to adding individual packages as"
" arguments to every command. This overrides the packages passed as arguments.",
)
Expand Down

0 comments on commit 0467c41

Please sign in to comment.