From 951e445733d2cfc9d9feed829d6f76ede62d8e64 Mon Sep 17 00:00:00 2001 From: Rahul Vats Date: Sat, 30 Dec 2023 12:07:11 +0530 Subject: [PATCH 1/9] removing -force-reinstall --- .circleci/integration-tests/Dockerfile.astro_cloud | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/integration-tests/Dockerfile.astro_cloud b/.circleci/integration-tests/Dockerfile.astro_cloud index b89185b8d..59b139780 100644 --- a/.circleci/integration-tests/Dockerfile.astro_cloud +++ b/.circleci/integration-tests/Dockerfile.astro_cloud @@ -75,7 +75,7 @@ ENV PATH $PATH:$JAVA_HOME/bin::$HIVE_HOME/bin:$HADOOP_HOME/bin COPY astronomer-providers /tmp/astronomer-providers RUN python3 -m pip install --upgrade pip # Ideally we should install using constraints file -RUN pip install --upgrade --force-reinstall --no-cache-dir /tmp/astronomer-providers[all] +RUN pip install --upgrade --no-cache-dir /tmp/astronomer-providers[all] RUN pip install apache-airflow-providers-slack # Install astronomer-starship-provider needed for the astronomer_migration_dag to transfer Airflow metadata between deployments From de13da5435da0fb70a21799b1f2ba5ce26d73185 Mon Sep 17 00:00:00 2001 From: Rahul Vats Date: Sat, 30 Dec 2023 13:18:24 +0530 Subject: [PATCH 2/9] pin lxml version below 5.0.0 --- .circleci/integration-tests/Dockerfile.astro_cloud | 2 +- setup.cfg | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/integration-tests/Dockerfile.astro_cloud b/.circleci/integration-tests/Dockerfile.astro_cloud index 59b139780..b89185b8d 100644 --- a/.circleci/integration-tests/Dockerfile.astro_cloud +++ b/.circleci/integration-tests/Dockerfile.astro_cloud @@ -75,7 +75,7 @@ ENV PATH $PATH:$JAVA_HOME/bin::$HIVE_HOME/bin:$HADOOP_HOME/bin COPY astronomer-providers /tmp/astronomer-providers RUN python3 -m pip install --upgrade pip # Ideally we should install using constraints file -RUN pip install --upgrade --no-cache-dir /tmp/astronomer-providers[all] +RUN pip install --upgrade --force-reinstall --no-cache-dir /tmp/astronomer-providers[all] RUN pip install apache-airflow-providers-slack # Install astronomer-starship-provider needed for the astronomer_migration_dag to transfer Airflow metadata between deployments diff --git a/setup.cfg b/setup.cfg index f9daca796..b90690b60 100644 --- a/setup.cfg +++ b/setup.cfg @@ -139,6 +139,7 @@ all = openlineage-airflow>=0.12.0 paramiko snowflake-sqlalchemy>=1.4.4 # Temporary solution for https://github.com/astronomer/astronomer-providers/issues/958, we should pin apache-airflow-providers-snowflake version after it pins this package to great than or equal to 1.4.4. + libxml2<5.0.0 # temporary fix due to issue while install 5.0.0 [options.packages.find] include = From d4f37b83d9ec65cceae0a578edd10fffe20ddc92 Mon Sep 17 00:00:00 2001 From: Rahul Vats Date: Sat, 30 Dec 2023 13:36:43 +0530 Subject: [PATCH 3/9] pinning lxml version to 4.9.4 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index b90690b60..e349066f9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -139,7 +139,7 @@ all = openlineage-airflow>=0.12.0 paramiko snowflake-sqlalchemy>=1.4.4 # Temporary solution for https://github.com/astronomer/astronomer-providers/issues/958, we should pin apache-airflow-providers-snowflake version after it pins this package to great than or equal to 1.4.4. - libxml2<5.0.0 # temporary fix due to issue while install 5.0.0 + libxml==4.9.4 # temporary fix due to issue while install 5.0.0 [options.packages.find] include = From b50690e9890f45d8e6afd20979d91b419f6d8f98 Mon Sep 17 00:00:00 2001 From: Rahul Vats Date: Sat, 30 Dec 2023 13:44:26 +0530 Subject: [PATCH 4/9] pinning lxml version to 4.9.4 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index e349066f9..8ee58a521 100644 --- a/setup.cfg +++ b/setup.cfg @@ -47,6 +47,7 @@ zip_safe = false amazon = apache-airflow-providers-amazon>=3.0.0 aiobotocore>=2.1.1 + libxml==4.9.4 # temporary fix due to issue while install 5.0.0 apache.hive = apache-airflow-providers-apache-hive>=6.1.5 impyla @@ -139,7 +140,6 @@ all = openlineage-airflow>=0.12.0 paramiko snowflake-sqlalchemy>=1.4.4 # Temporary solution for https://github.com/astronomer/astronomer-providers/issues/958, we should pin apache-airflow-providers-snowflake version after it pins this package to great than or equal to 1.4.4. - libxml==4.9.4 # temporary fix due to issue while install 5.0.0 [options.packages.find] include = From 7eb5eaf15c0ea96d1b7dce40c2acd27b5d26afef Mon Sep 17 00:00:00 2001 From: Rahul Vats Date: Sat, 30 Dec 2023 13:46:44 +0530 Subject: [PATCH 5/9] pinning lxml version to 4.9.4 --- setup.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 8ee58a521..eb0c9e519 100644 --- a/setup.cfg +++ b/setup.cfg @@ -47,7 +47,6 @@ zip_safe = false amazon = apache-airflow-providers-amazon>=3.0.0 aiobotocore>=2.1.1 - libxml==4.9.4 # temporary fix due to issue while install 5.0.0 apache.hive = apache-airflow-providers-apache-hive>=6.1.5 impyla @@ -140,7 +139,7 @@ all = openlineage-airflow>=0.12.0 paramiko snowflake-sqlalchemy>=1.4.4 # Temporary solution for https://github.com/astronomer/astronomer-providers/issues/958, we should pin apache-airflow-providers-snowflake version after it pins this package to great than or equal to 1.4.4. - + lxml==4.9.4 # temporary fix due to issue while install 5.0.0 [options.packages.find] include = astronomer.* From 4855b60b8f4cbf012b8a1300dac706e7171e2c1c Mon Sep 17 00:00:00 2001 From: Rahul Vats Date: Sat, 30 Dec 2023 14:18:10 +0530 Subject: [PATCH 6/9] adding libxml2-dev libxslt-dev zlib1g-dev packages --- .circleci/integration-tests/Dockerfile.astro_cloud | 1 + setup.cfg | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/integration-tests/Dockerfile.astro_cloud b/.circleci/integration-tests/Dockerfile.astro_cloud index b89185b8d..d42344de8 100644 --- a/.circleci/integration-tests/Dockerfile.astro_cloud +++ b/.circleci/integration-tests/Dockerfile.astro_cloud @@ -9,6 +9,7 @@ USER root RUN apt-get update -y \ && apt-get install -y software-properties-common \ && apt-get install -y wget procps gnupg2 + && libxml2-dev libxslt-dev zlib1g-dev # Install openjdk-8 RUN apt-add-repository 'deb http://archive.debian.org/debian stretch main' \ diff --git a/setup.cfg b/setup.cfg index eb0c9e519..7bc581330 100644 --- a/setup.cfg +++ b/setup.cfg @@ -139,7 +139,6 @@ all = openlineage-airflow>=0.12.0 paramiko snowflake-sqlalchemy>=1.4.4 # Temporary solution for https://github.com/astronomer/astronomer-providers/issues/958, we should pin apache-airflow-providers-snowflake version after it pins this package to great than or equal to 1.4.4. - lxml==4.9.4 # temporary fix due to issue while install 5.0.0 [options.packages.find] include = astronomer.* From 7d9ed60e544d300671d29e53567ea33080c6584d Mon Sep 17 00:00:00 2001 From: Rahul Vats Date: Sat, 30 Dec 2023 14:19:28 +0530 Subject: [PATCH 7/9] adding libxml2-dev libxslt-dev zlib1g-dev packages --- .circleci/integration-tests/Dockerfile.astro_cloud | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/integration-tests/Dockerfile.astro_cloud b/.circleci/integration-tests/Dockerfile.astro_cloud index d42344de8..b90b420d6 100644 --- a/.circleci/integration-tests/Dockerfile.astro_cloud +++ b/.circleci/integration-tests/Dockerfile.astro_cloud @@ -8,7 +8,7 @@ USER root RUN apt-get update -y \ && apt-get install -y software-properties-common \ - && apt-get install -y wget procps gnupg2 + && apt-get install -y wget procps gnupg2 \ && libxml2-dev libxslt-dev zlib1g-dev # Install openjdk-8 From e3a5347d434cf5856c52a1aab0089ed1186f5128 Mon Sep 17 00:00:00 2001 From: Rahul Vats Date: Sat, 30 Dec 2023 14:22:06 +0530 Subject: [PATCH 8/9] adding libxml2-dev libxslt-dev zlib1g-dev packages --- .circleci/integration-tests/Dockerfile.astro_cloud | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/integration-tests/Dockerfile.astro_cloud b/.circleci/integration-tests/Dockerfile.astro_cloud index b90b420d6..f32632d27 100644 --- a/.circleci/integration-tests/Dockerfile.astro_cloud +++ b/.circleci/integration-tests/Dockerfile.astro_cloud @@ -9,7 +9,7 @@ USER root RUN apt-get update -y \ && apt-get install -y software-properties-common \ && apt-get install -y wget procps gnupg2 \ - && libxml2-dev libxslt-dev zlib1g-dev + && apt-get install -y build-essential libxml2-dev libxslt-dev zlib1g-dev # Install openjdk-8 RUN apt-add-repository 'deb http://archive.debian.org/debian stretch main' \ From 729efee51b21919c839893c23d5af77ff86a2c01 Mon Sep 17 00:00:00 2001 From: Rahul Vats Date: Sat, 30 Dec 2023 15:18:12 +0530 Subject: [PATCH 9/9] fix formatting --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 7bc581330..f9daca796 100644 --- a/setup.cfg +++ b/setup.cfg @@ -139,6 +139,7 @@ all = openlineage-airflow>=0.12.0 paramiko snowflake-sqlalchemy>=1.4.4 # Temporary solution for https://github.com/astronomer/astronomer-providers/issues/958, we should pin apache-airflow-providers-snowflake version after it pins this package to great than or equal to 1.4.4. + [options.packages.find] include = astronomer.*