From 911465ba5176985cd0daf19d96265bb83a93a2bb Mon Sep 17 00:00:00 2001 From: Andrey Anshin Date: Tue, 13 Feb 2024 21:19:37 +0400 Subject: [PATCH 1/2] Remove `markdown` from core dependencies --- Dockerfile | 2 +- Dockerfile.ci | 2 +- pyproject.toml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 265b10d5f4619..eda025c718d94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1374,7 +1374,7 @@ ARG USE_CONSTRAINTS_FOR_CONTEXT_PACKAGES="false" # By changing the epoch we can force reinstalling Airflow and pip all dependencies # It can also be overwritten manually by setting the AIRFLOW_CI_BUILD_EPOCH environment variable. -ARG AIRFLOW_CI_BUILD_EPOCH="10" +ARG AIRFLOW_CI_BUILD_EPOCH="11" ENV AIRFLOW_CI_BUILD_EPOCH=${AIRFLOW_CI_BUILD_EPOCH} # In case of Production build image segment we want to pre-install main version of airflow diff --git a/Dockerfile.ci b/Dockerfile.ci index 8946f2d9037c4..3f09a01d18397 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1107,7 +1107,7 @@ ARG AIRFLOW_CONSTRAINTS_LOCATION="" ARG DEFAULT_CONSTRAINTS_BRANCH="constraints-main" # By changing the epoch we can force reinstalling Airflow and pip all dependencies # It can also be overwritten manually by setting the AIRFLOW_CI_BUILD_EPOCH environment variable. -ARG AIRFLOW_CI_BUILD_EPOCH="10" +ARG AIRFLOW_CI_BUILD_EPOCH="11" ARG AIRFLOW_PRE_CACHED_PIP_PACKAGES="true" ARG AIRFLOW_PIP_VERSION=24.0 # Setup PIP diff --git a/pyproject.toml b/pyproject.toml index f17c6c9ff83e3..84b5eacb120fb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -111,7 +111,6 @@ dependencies = [ "linkify-it-py>=2.0.0", "lockfile>=0.12.2", "markdown-it-py>=2.1.0", - "markdown>=3.0", "markupsafe>=1.1.1", "marshmallow-oneofschema>=2.0.1", "mdit-py-plugins>=0.3.0", From 8efbb8ece8d5984b5ad74a7781bb956d92138490 Mon Sep 17 00:00:00 2001 From: Andrey Anshin Date: Tue, 13 Feb 2024 22:46:45 +0400 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Jarek Potiuk --- Dockerfile | 2 +- Dockerfile.ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index eda025c718d94..265b10d5f4619 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1374,7 +1374,7 @@ ARG USE_CONSTRAINTS_FOR_CONTEXT_PACKAGES="false" # By changing the epoch we can force reinstalling Airflow and pip all dependencies # It can also be overwritten manually by setting the AIRFLOW_CI_BUILD_EPOCH environment variable. -ARG AIRFLOW_CI_BUILD_EPOCH="11" +ARG AIRFLOW_CI_BUILD_EPOCH="10" ENV AIRFLOW_CI_BUILD_EPOCH=${AIRFLOW_CI_BUILD_EPOCH} # In case of Production build image segment we want to pre-install main version of airflow diff --git a/Dockerfile.ci b/Dockerfile.ci index 3f09a01d18397..8946f2d9037c4 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1107,7 +1107,7 @@ ARG AIRFLOW_CONSTRAINTS_LOCATION="" ARG DEFAULT_CONSTRAINTS_BRANCH="constraints-main" # By changing the epoch we can force reinstalling Airflow and pip all dependencies # It can also be overwritten manually by setting the AIRFLOW_CI_BUILD_EPOCH environment variable. -ARG AIRFLOW_CI_BUILD_EPOCH="11" +ARG AIRFLOW_CI_BUILD_EPOCH="10" ARG AIRFLOW_PRE_CACHED_PIP_PACKAGES="true" ARG AIRFLOW_PIP_VERSION=24.0 # Setup PIP