Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed deprectaed extras dict from hatch build #42647

Merged
merged 4 commits into from
Oct 6, 2024
Merged

Removed deprectaed extras dict from hatch build #42647

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
544e132
Removed deprectaed extras dict from hatch build
dirrao Oct 2, 2024
3e7a96c
Merge branch 'main' into hatch_build_deprecated_extras_removal
dirrao Oct 5, 2024
8be4445
news fragment added
dirrao Oct 5, 2024
e50799f
Merge branch 'main' into hatch_build_deprecated_extras_removal
dirrao Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 1 addition & 58 deletions hatch_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,62 +341,6 @@
],
}

DEPRECATED_EXTRAS: dict[str, list[str]] = {
########################################################################################################
# The whole section can be removed in Airflow 3.0 as those old aliases are deprecated in 2.* series
########################################################################################################
"atlas": [
"apache-airflow[apache-atlas]",
],
"aws": [
"apache-airflow[amazon]",
],
"azure": [
"apache-airflow[microsoft-azure]",
],
"cassandra": [
"apache-airflow[apache-cassandra]",
],
# Empty alias extra just for backward compatibility with Airflow 1.10
"crypto": [],
"druid": [
"apache-airflow[apache-druid]",
],
"gcp": [
"apache-airflow[google]",
],
"gcp-api": [
"apache-airflow[google]",
],
"hdfs": [
"apache-airflow[apache-hdfs]",
],
"hive": [
"apache-airflow[apache-hive]",
],
"kubernetes": [
"apache-airflow[cncf-kubernetes]",
],
"mssql": [
"apache-airflow[microsoft-mssql]",
],
"pinot": [
"apache-airflow[apache-pinot]",
],
"s3": [
"apache-airflow[amazon]",
],
"spark": [
"apache-airflow[apache-spark]",
],
"webhdfs": [
"apache-airflow[apache-webhdfs]",
],
"winrm": [
"apache-airflow[microsoft-winrm]",
],
}

# When you remove a dependency from the list, you should also make sure to add the dependency to be removed
# in the scripts/docker/install_airflow_dependencies_from_branch_tip.sh script DEPENDENCIES_TO_REMOVE
# in order to make sure the dependency is not installed in the CI image build process from the main
Expand Down Expand Up @@ -509,7 +453,6 @@
(DOC_EXTRAS, "Doc extras"),
(DEVEL_EXTRAS, "Devel extras"),
(BUNDLE_EXTRAS, "Bundle extras"),
(DEPRECATED_EXTRAS, "Deprecated extras"),
]

ALL_GENERATED_BUNDLE_EXTRAS = ["all", "all-core", "devel-all", "devel-ci"]
Expand Down Expand Up @@ -933,7 +876,7 @@ def _process_all_built_in_extras(self, version: str) -> None:
for extra, deps in dict.items():
self.all_devel_extras.add(extra)
self._add_devel_ci_dependencies(deps, python_exclusion="")
if dict not in [DEPRECATED_EXTRAS, DEVEL_EXTRAS, DOC_EXTRAS]:
if dict not in [DEVEL_EXTRAS, DOC_EXTRAS]:
# do not add deprecated extras to "all" extras
self.all_non_devel_extras.add(extra)
if version == "standard":
Expand Down
Loading