Skip to content

Fixes sqlalchemy flask failure with python 3.8.4 #9821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaxil merged 1 commit into from
Jul 14, 2020
Merged

Fixes sqlalchemy flask failure with python 3.8.4 #9821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements-python3.6.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements-python3.7.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements-python3.8.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 2 additions & 10 deletions scripts/ci/libraries/_initialization.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down