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 2024/02/11 21:17:33 UTC
(airflow) branch main updated: Swtich to standard way of specifying package extra for github URL (#37342)
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 af5fa6ed7c Swtich to standard way of specifying package extra for github URL (#37342)
af5fa6ed7c is described below
commit af5fa6ed7cddb90d05ec165b90a000bcf15ee4a0
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sun Feb 11 22:17:27 2024 +0100
Swtich to standard way of specifying package extra for github URL (#37342)
As discussed in https://github.com/pypa/pip/pull/11617 installing
package with extra via #egg fragment is going to be removed (pip
raises warning about it). Using "package[extra] @ URL" is proper
way of installing from Git URL
---
Dockerfile | 2 +-
Dockerfile.ci | 2 +-
scripts/docker/install_airflow_dependencies_from_branch_tip.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 11aad19a07..2ced62a655 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -453,7 +453,7 @@ function install_airflow_dependencies_from_branch_tip() {
set -x
pip install --root-user-action ignore \
${ADDITIONAL_PIP_INSTALL_FLAGS} \
- "https://github.com/${AIRFLOW_REPO}/archive/${AIRFLOW_BRANCH}.tar.gz#egg=apache-airflow[${AIRFLOW_EXTRAS}]"
+ "apache-airflow[${AIRFLOW_EXTRAS}] @ https://github.com/${AIRFLOW_REPO}/archive/${AIRFLOW_BRANCH}.tar.gz"
common::install_pip_version
# Uninstall airflow to keep only the dependencies. In the future when planned https://github.com/pypa/pip/issues/11440
# is implemented in pip we might be able to use this flag and skip the remove step.
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 19744fe6c2..a80eed2ac3 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -413,7 +413,7 @@ function install_airflow_dependencies_from_branch_tip() {
set -x
pip install --root-user-action ignore \
${ADDITIONAL_PIP_INSTALL_FLAGS} \
- "https://github.com/${AIRFLOW_REPO}/archive/${AIRFLOW_BRANCH}.tar.gz#egg=apache-airflow[${AIRFLOW_EXTRAS}]"
+ "apache-airflow[${AIRFLOW_EXTRAS}] @ https://github.com/${AIRFLOW_REPO}/archive/${AIRFLOW_BRANCH}.tar.gz"
common::install_pip_version
# Uninstall airflow to keep only the dependencies. In the future when planned https://github.com/pypa/pip/issues/11440
# is implemented in pip we might be able to use this flag and skip the remove step.
diff --git a/scripts/docker/install_airflow_dependencies_from_branch_tip.sh b/scripts/docker/install_airflow_dependencies_from_branch_tip.sh
index fcb30505d9..7a58f2ac15 100644
--- a/scripts/docker/install_airflow_dependencies_from_branch_tip.sh
+++ b/scripts/docker/install_airflow_dependencies_from_branch_tip.sh
@@ -52,7 +52,7 @@ function install_airflow_dependencies_from_branch_tip() {
set -x
pip install --root-user-action ignore \
${ADDITIONAL_PIP_INSTALL_FLAGS} \
- "https://github.com/${AIRFLOW_REPO}/archive/${AIRFLOW_BRANCH}.tar.gz#egg=apache-airflow[${AIRFLOW_EXTRAS}]"
+ "apache-airflow[${AIRFLOW_EXTRAS}] @ https://github.com/${AIRFLOW_REPO}/archive/${AIRFLOW_BRANCH}.tar.gz"
common::install_pip_version
# Uninstall airflow to keep only the dependencies. In the future when planned https://github.com/pypa/pip/issues/11440
# is implemented in pip we might be able to use this flag and skip the remove step.