You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ep...@apache.org on 2023/01/11 21:25:43 UTC

[airflow] 02/27: Re-enable Plyvel on ARM as it now builds cleanly (#28443)

This is an automated email from the ASF dual-hosted git repository.

ephraimanierobi pushed a commit to branch v2-5-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit c92e7ba9278cfe876f164390a5782a586a9bfdf6
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sun Dec 18 21:40:29 2022 +0100

    Re-enable Plyvel on ARM as it now builds cleanly (#28443)
    
    Previously, Plyvel had to be disabled in order to get
    ARM compatibility (it did not have
    binary wheels released and it failed to compile cleanly on debian).
    But the last problem is fixed now, so we can re-enable it for ARM.
    
    (cherry picked from commit bea91b90180f075c974d58be438b80e3da8607ca)
---
 Dockerfile                                | 2 +-
 Dockerfile.ci                             | 2 +-
 scripts/docker/install_os_dependencies.sh | 2 +-
 setup.py                                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d497d07c6d..bab2cda06a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -95,7 +95,7 @@ function get_dev_apt_deps() {
     if [[ "${DEV_APT_DEPS=}" == "" ]]; then
         DEV_APT_DEPS="apt-transport-https apt-utils build-essential ca-certificates dirmngr \
 freetds-bin freetds-dev git gosu graphviz graphviz-dev krb5-user ldap-utils libffi-dev \
-libkrb5-dev libldap2-dev libsasl2-2 libsasl2-dev libsasl2-modules \
+libkrb5-dev libldap2-dev libleveldb1d libleveldb-dev libsasl2-2 libsasl2-dev libsasl2-modules \
 libssl-dev locales lsb-release openssh-client sasl2-bin \
 software-properties-common sqlite3 sudo unixodbc unixodbc-dev"
         export DEV_APT_DEPS
diff --git a/Dockerfile.ci b/Dockerfile.ci
index f2e64830fb..0713cc8b71 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -55,7 +55,7 @@ function get_dev_apt_deps() {
     if [[ "${DEV_APT_DEPS=}" == "" ]]; then
         DEV_APT_DEPS="apt-transport-https apt-utils build-essential ca-certificates dirmngr \
 freetds-bin freetds-dev git gosu graphviz graphviz-dev krb5-user ldap-utils libffi-dev \
-libkrb5-dev libldap2-dev libsasl2-2 libsasl2-dev libsasl2-modules \
+libkrb5-dev libldap2-dev libleveldb1d libleveldb-dev libsasl2-2 libsasl2-dev libsasl2-modules \
 libssl-dev locales lsb-release openssh-client sasl2-bin \
 software-properties-common sqlite3 sudo unixodbc unixodbc-dev"
         export DEV_APT_DEPS
diff --git a/scripts/docker/install_os_dependencies.sh b/scripts/docker/install_os_dependencies.sh
index 4ddeca0cf5..50aec97fa5 100644
--- a/scripts/docker/install_os_dependencies.sh
+++ b/scripts/docker/install_os_dependencies.sh
@@ -37,7 +37,7 @@ function get_dev_apt_deps() {
     if [[ "${DEV_APT_DEPS=}" == "" ]]; then
         DEV_APT_DEPS="apt-transport-https apt-utils build-essential ca-certificates dirmngr \
 freetds-bin freetds-dev git gosu graphviz graphviz-dev krb5-user ldap-utils libffi-dev \
-libkrb5-dev libldap2-dev libsasl2-2 libsasl2-dev libsasl2-modules \
+libkrb5-dev libldap2-dev libleveldb1d libleveldb-dev libsasl2-2 libsasl2-dev libsasl2-modules \
 libssl-dev locales lsb-release openssh-client sasl2-bin \
 software-properties-common sqlite3 sudo unixodbc unixodbc-dev"
         export DEV_APT_DEPS
diff --git a/setup.py b/setup.py
index b3e7768225..2484b2076d 100644
--- a/setup.py
+++ b/setup.py
@@ -304,7 +304,7 @@ ldap = [
     "ldap3>=2.5.1",
     "python-ldap",
 ]
-leveldb = ['plyvel; platform_machine != "aarch64"']
+leveldb = ["plyvel"]
 pandas = [
     "pandas>=0.17.1",
 ]