From 847f89ca058acc65722cfd4df5c9de26dd2b0e97 Mon Sep 17 00:00:00 2001 From: krassowski Date: Fri, 6 Oct 2017 23:26:40 +0000 Subject: [PATCH] Flask-sqlalchemy 2.3 is there! --- README.md | 7 ------- setup.sh | 7 ------- website/requirements.txt | 2 +- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/README.md b/README.md index a7cb93f1b..3be6ac0dc 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,6 @@ python3 -m pip install -r requirements.txt ``` In case of problems with the execution of commands above on Debian/Ubuntu running machines, look at the bottom of this page where alternative instructions are given. An additional requirement is `bsddb3` package, which is often easier to install system-wide with your package manager (on Debian named `python3-bsddb3`). You may need to add a symbolic link to the package inside of your virtual environment. -Recently released version of flask-sqlalchemy (2.2, Feb 2017) fixed some important issues but introduced a regression bug [#470](https://github.com/mitsuhiko/flask-sqlalchemy/issues/470) which forces use of forked, patched version until it is fixed. To get patched version, you will need to clone [flask_sqlalchemy directory](https://github.com/krassowski/flask-sqlalchemy/flask_sqlalchemy) into `website` directory: -```bash -git clone https://github.com/krassowski/flask-sqlalchemy/ -mv flask-sqlalchemy/flask_sqlalchemy . -rm -rf flask-sqlalchemy -``` - ### Backend #### Prerequisites diff --git a/setup.sh b/setup.sh index 511ce574d..052e85f72 100644 --- a/setup.sh +++ b/setup.sh @@ -11,13 +11,6 @@ sudo make install cd .. cd ../.. -# Get recent, patched version of flask-sqlalchemy -cd website -git clone https://github.com/krassowski/flask-sqlalchemy/ -mv flask-sqlalchemy/flask_sqlalchemy . -rm -rf flask-sqlalchemy -cd .. - # Use examplar configuration for the beginning cd website mv example_config.py config.py diff --git a/website/requirements.txt b/website/requirements.txt index e34ae16fa..6e80e838d 100644 --- a/website/requirements.txt +++ b/website/requirements.txt @@ -4,7 +4,7 @@ rpy2 Flask==0.12.2 Flask-Assets==0.12 Flask-Classful==0.13.1 -Flask-SQLAlchemy==2.2 +Flask-SQLAlchemy==2.3.1 passlib==1.6.5 webassets==0.12.1 mysqlclient