migrate jormun to flask cli in place of flask-script

gatling/readme.md

@@ -38,7 +38,7 @@ You need to create a *uwsgi_config_file.ini* to run with Jormungandr app.
 [uwsgi]
 plugins = python
 http-socket = :5000
-wsgi-file = manage.py
+wsgi-file = jormungandr:app
 callable = app
 processes = 4
 lazy-apps = True

install.rst

@@ -144,7 +144,7 @@ Testing
 
    #. Give him the configuration file (by default it uses source/jormungandr/default_settings.py) and run it
 
-      ``JORMUNGANDR_CONFIG_FILE=your_config.py python manage.py runserver``
+      ``JORMUNGANDR_CONFIG_FILE=your_config.py FLASK_APP=jormungandr:app flask run``
 
    #. Grab a browser and open http://localhost:5000/v1/coverage/default_region
 

scripts/build_navitia.sh

@@ -347,7 +347,9 @@ sed "s,^INSTANCES_DIR.*,INSTANCES_DIR = '$run_dir/jormungandr'," "$navitia_dir"/
 #we also don't want to depend on the jormungandr database for this test
 sed -i 's/DISABLE_DATABASE.*/DISABLE_DATABASE=False/' "$run_dir"/jormungandr_settings.py
 
-JORMUNGANDR_CONFIG_FILE="$run_dir"/jormungandr_settings.py PYTHONPATH="$navitia_dir/source/navitiacommon:$navitia_dir/source/jormungandr" python "$navitia_dir"/source/jormungandr/jormungandr/manage.py runserver -d -r &
+pushd "$navitia_dir/source/jormungandr"
+JORMUNGANDR_CONFIG_FILE="$run_dir"/jormungandr_settings.py PYTHONPATH="$navitia_dir/source/navitiacommon:$navitia_dir/source/jormungandr" FLASK_APP=jormungandr:app flask run &
+popd
 
 jormun_pid=$!
 

scripts/build_setup_and_run_navitia_demo.sh

@@ -200,7 +200,12 @@ sed "s,^INSTANCES_DIR.*,INSTANCES_DIR = '$run_dir/jormungandr'," "$navitia_dir"/
 #we also don't want to depend on the jormungandr database for this test
 sed -i 's/DISABLE_DATABASE.*/DISABLE_DATABASE=False/' "$run_dir"/jormungandr/jormungandr_settings.py
 
-JORMUNGANDR_CONFIG_FILE="$run_dir"/jormungandr/jormungandr_settings.py PYTHONPATH="$navitia_dir/source/navitiacommon:$navitia_dir/source/jormungandr" python "$navitia_dir"/source/jormungandr/jormungandr/manage.py runserver -d -r &
+export JORMUNGANDR_CONFIG_FILE="$run_dir"/jormungandr/jormungandr_settings.py
+export PYTHONPATH="$navitia_dir/source/navitiacommon:$navitia_dir/source/jormungandr"
+export FLASK_APP=jormungandr:app
+pushd "$navitia_dir/source/jormungandr"
+flask run &
+popd
 jormun_pid=$!
 
 

source/jormungandr/readme.md

@@ -50,7 +50,7 @@ Environment variables can be set when the service is started. Referer to [defaul
 example for a development environment:
 
 ```sh
-PYTHONPATH=..:../../navitiacommon/ JORMUNGANDR_INSTANCES_DIR=~/jormung_conf/ JORMUNGANDR_START_MONITORING_THREAD=False  JORMUNGANDR_DISABLE_DATABASE=True JORMUNGANDR_IS_PUBLIC=True python manage.py runserver
+PYTHONPATH=..:../../navitiacommon/ JORMUNGANDR_INSTANCES_DIR=~/jormung_conf/ JORMUNGANDR_START_MONITORING_THREAD=False JORMUNGANDR_DISABLE_DATABASE=True JORMUNGANDR_IS_PUBLIC=True FLASK_APP=jormungandr:app flask run
 ```
 
 ## custom_settings.py
@@ -60,7 +60,7 @@ This helps you overwrite the default settings from a file. Prevent from mixing b
 Use `JORMUNGANDR_CONFIG_FILE` to tell where your file is located like:  
 
 ```sh
-PYTHONPATH=..:../../navitiacommon/ JORMUNGANDR_INSTANCES_DIR=~/jormung_conf/ JORMUNGANDR_CONFIG_FILE=~/jormung_conf/jormung_settings.py  python manage.py runserver
+PYTHONPATH=..:../../navitiacommon/ JORMUNGANDR_INSTANCES_DIR=~/jormung_conf/ JORMUNGANDR_CONFIG_FILE=~/jormung_conf/jormung_settings.py FLASK_APP=jormungandr:app flask run
 ```
 
 # Run
@@ -69,14 +69,14 @@ To run the web service, you'll need to:
 
 * set `JORMUNGANDR_INSTANCES_DIR` to point at the directory that contains your `jormungandr.json`.
 * add `navitia/source/jormungandr` and `navitia/navitiacommon` to your python path via `PYTHONPATH`.
-* [optionaly] set `JORMUNGANDR_CONFIG_FILE` to point at your `custom_settings.py`.  
+* [optionaly] set `JORMUNGANDR_CONFIG_FILE` to point at your `custom_settings.py`.
 
 ## Example
 
 From `navitia/source/jormungandr/jormungandr` run :
 
 ```sh
-PYTHONPATH=..:../../navitiacommon/ JORMUNGANDR_INSTANCES_DIR=~/jormung_conf/ python manage.py runserver
+PYTHONPATH=..:../../navitiacommon/ JORMUNGANDR_INSTANCES_DIR=~/jormung_conf/ FLASK_APP=jormungandr:app flask run
 ```
 
 # Option

source/jormungandr/requirements.txt

@@ -1,7 +1,6 @@
 Flask==1.1.1
 git+https://github.com/CanalTP/flask-restful.git@76346f65ca12a8edb9b32688cdc192ad391fa686
 Flask-SQLAlchemy==2.4
-Flask-Script==0.6.7
 Flask-Cors==1.9.0
 GeoAlchemy2==0.2.4
 geojson==1.3.3