potiuk commented on a change in pull request #12685:
URL: https://github.com/apache/airflow/pull/12685#discussion_r537064297
##########
File path: scripts/in_container/entrypoint_ci.sh
##########
@@ -98,13 +101,51 @@ if [[ -z ${INSTALL_AIRFLOW_VERSION=} ]]; then
mkdir -p "${AIRFLOW_SOURCES}"/logs/
mkdir -p "${AIRFLOW_SOURCES}"/tmp/
export PYTHONPATH=${AIRFLOW_SOURCES}
+elif [[ ${INSTALL_AIRFLOW_VERSION} == "none" ]]; then
+ echo
+ echo "Skip installing airflow - only install wheel packages that are
present locally"
+ echo
+ uninstall_airflow_and_providers
+elif [[ ${INSTALL_AIRFLOW_VERSION} == "wheel" ]]; then
+ echo
+ echo "Install airflow from wheel package with [all] extras but
uninstalling providers."
+ echo
+ uninstall_airflow_and_providers
+ install_airflow_from_wheel "[all]"
+ uninstall_providers
else
- # Installs released airflow version without adding more extras
- install_released_airflow_version "" "${INSTALL_AIRFLOW_VERSION}"
+ echo
+ echo "Install airflow from PyPI including [all] extras"
+ echo
+ install_released_airflow_version "${INSTALL_AIRFLOW_VERSION}" "[all]"
fi
-
-if [[ ${INSTALL_WHEELS=} == "true" ]]; then
- pip install /dist/*.whl || true
+if [[ ${INSTALL_PACKAGES_FROM_DIST=} == "true" ]]; then
+ echo
+ echo "Install all packages from dist folder"
+ if [[ ${INSTALL_AIRFLOW_VERSION} == "wheel" ]]; then
+ echo "(except apache-airflow)"
+ fi
+ echo
+ installable_files=()
+ for file in /dist/*.{whl,tar.gz}
+ do
+ if [[ ${INSTALL_AIRFLOW_VERSION} == "wheel" && ${file} ==
"apache?airflow-[0-9]"* ]]; then
+ # Skip Apache Airflow package - it's just been installed above
with extras
+ echo "Skipping ${file}"
+ continue
+ fi
+ if [[ (${PACKAGE_FORMAT} == "wheel" || ${PACKAGE_FORMAT} == "both") &&
${file} == *".whl" ]]; then
+ echo "Adding ${file} to install"
+ installable_files+=( "${file}" )
+ fi
+ if [[ (${PACKAGE_FORMAT} == "sdist" || ${PACKAGE_FORMAT} == "both") &&
${file} == *".tar.gz" ]]; then
+ echo "Adding ${file} to install"
+ installable_files+=( "${file}" )
+ fi
Review comment:
Correct. I removed it and added if to error (with RED COLOR) if 'both'
is used in this case.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
