From 6ba022008e86f75668b2c76ae58e5238b5261c41 Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Tue, 14 Jul 2020 19:29:13 +0200
Subject: [PATCH] Fixes sqlalchemy flask failure with python 3.8.4

---
 Dockerfile.ci                           |  2 +-
 requirements/requirements-python3.6.txt |  4 ++--
 requirements/requirements-python3.7.txt |  4 ++--
 requirements/requirements-python3.8.txt |  4 ++--
 scripts/ci/libraries/_initialization.sh | 12 ++----------
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index bff6bbfc871df..ade6a70400529 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -218,7 +218,7 @@ RUN echo "Installing with extras: ${AIRFLOW_EXTRAS}."
 
 # By changing the CI build epoch we can force reinstalling Arflow from the current master
 # It can also be overwritten manually by setting the AIRFLOW_CI_BUILD_EPOCH environment variable.
-ARG AIRFLOW_CI_BUILD_EPOCH="1"
+ARG AIRFLOW_CI_BUILD_EPOCH="2"
 ENV AIRFLOW_CI_BUILD_EPOCH=${AIRFLOW_CI_BUILD_EPOCH}
 
 # In case of CI builds we want to pre-install master version of airflow dependencies so that
diff --git a/requirements/requirements-python3.6.txt b/requirements/requirements-python3.6.txt
index 792e90827ddbe..3ecde7f7b026f 100644
--- a/requirements/requirements-python3.6.txt
+++ b/requirements/requirements-python3.6.txt
@@ -9,7 +9,7 @@ Flask-JWT-Extended==3.24.1
 Flask-Login==0.4.1
 Flask-OAuthlib==0.9.5
 Flask-OpenID==1.2.5
-Flask-SQLAlchemy==2.4.3
+Flask-SQLAlchemy==2.4.4
 Flask-WTF==0.14.3
 Flask==1.1.2
 GitPython==3.1.7
@@ -332,7 +332,7 @@ sentinels==1.0.0
 sentry-sdk==0.16.1
 setproctitle==1.1.10
 sh==1.13.1
-simple-salesforce==1.1.0
+simple-salesforce==1.10.1
 six==1.15.0
 slackclient==2.7.2
 smmap==3.0.4
diff --git a/requirements/requirements-python3.7.txt b/requirements/requirements-python3.7.txt
index a055aceda4570..b7a0145949c80 100644
--- a/requirements/requirements-python3.7.txt
+++ b/requirements/requirements-python3.7.txt
@@ -9,7 +9,7 @@ Flask-JWT-Extended==3.24.1
 Flask-Login==0.4.1
 Flask-OAuthlib==0.9.5
 Flask-OpenID==1.2.5
-Flask-SQLAlchemy==2.4.3
+Flask-SQLAlchemy==2.4.4
 Flask-WTF==0.14.3
 Flask==1.1.2
 GitPython==3.1.7
@@ -327,7 +327,7 @@ sentinels==1.0.0
 sentry-sdk==0.16.1
 setproctitle==1.1.10
 sh==1.13.1
-simple-salesforce==1.1.0
+simple-salesforce==1.10.1
 six==1.15.0
 slackclient==2.7.2
 smmap==3.0.4
diff --git a/requirements/requirements-python3.8.txt b/requirements/requirements-python3.8.txt
index d1999581e029d..b0d277346c166 100644
--- a/requirements/requirements-python3.8.txt
+++ b/requirements/requirements-python3.8.txt
@@ -9,7 +9,7 @@ Flask-JWT-Extended==3.24.1
 Flask-Login==0.4.1
 Flask-OAuthlib==0.9.5
 Flask-OpenID==1.2.5
-Flask-SQLAlchemy==2.4.3
+Flask-SQLAlchemy==2.4.4
 Flask-WTF==0.14.3
 Flask==1.1.2
 GitPython==3.1.7
@@ -326,7 +326,7 @@ sentinels==1.0.0
 sentry-sdk==0.16.1
 setproctitle==1.1.10
 sh==1.13.1
-simple-salesforce==1.1.0
+simple-salesforce==1.10.1
 six==1.15.0
 slackclient==2.7.2
 smmap==3.0.4
diff --git a/scripts/ci/libraries/_initialization.sh b/scripts/ci/libraries/_initialization.sh
index 6e9c5c3b474e8..d159792ed729f 100644
--- a/scripts/ci/libraries/_initialization.sh
+++ b/scripts/ci/libraries/_initialization.sh
@@ -21,17 +21,9 @@ function initialize_common_environment {
     # default python Major/Minor version
     PYTHON_MAJOR_MINOR_VERSION=${PYTHON_MAJOR_MINOR_VERSION:="3.6"}
 
+    # python image version to use
+    # shellcheck disable=SC2034
     PYTHON_BASE_IMAGE_VERSION=${PYTHON_MAJOR_MINOR_VERSION}
-    if [[ ${PYTHON_BASE_IMAGE_VERSION} == "3.8" ]]; then
-        # Temporary fix for Python 3.8.4 failing our tests
-        # TODO: Remove after it gets fixed
-        PYTHON_BASE_IMAGE_VERSION="3.8.3"
-        echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-        echo " WARNING! Temporary switching to ${PYTHON_BASE_IMAGE_VERSION}"
-        echo "          Until we find root cause of problem introduced by 3.8.4"
-        echo
-        echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-    fi
 
     # extra flags passed to docker run for CI image
     # shellcheck disable=SC2034