Skip to content

Commit cd8c7c1

Browse files
committed
migrate jormun to flask cli in place of flask-script
1 parent 823e34a commit cd8c7c1

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

gatling/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ You need to create a *uwsgi_config_file.ini* to run with Jormungandr app.
3838
[uwsgi]
3939
plugins = python
4040
http-socket = :5000
41-
wsgi-file = manage.py
41+
wsgi-file = jormungandr:app
4242
callable = app
4343
processes = 4
4444
lazy-apps = True

install.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ Testing
144144

145145
#. Give him the configuration file (by default it uses source/jormungandr/default_settings.py) and run it
146146

147-
``JORMUNGANDR_CONFIG_FILE=your_config.py python manage.py runserver``
147+
``JORMUNGANDR_CONFIG_FILE=your_config.py FLASK_APP=jormungandr:app flask run``
148148

149149
#. Grab a browser and open http://localhost:5000/v1/coverage/default_region
150150

scripts/build_navitia.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,9 @@ sed "s,^INSTANCES_DIR.*,INSTANCES_DIR = '$run_dir/jormungandr'," "$navitia_dir"/
347347
#we also don't want to depend on the jormungandr database for this test
348348
sed -i 's/DISABLE_DATABASE.*/DISABLE_DATABASE=False/' "$run_dir"/jormungandr_settings.py
349349

350-
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 &
350+
pushd "$navitia_dir/source/jormungandr"
351+
JORMUNGANDR_CONFIG_FILE="$run_dir"/jormungandr_settings.py PYTHONPATH="$navitia_dir/source/navitiacommon:$navitia_dir/source/jormungandr" FLASK_APP=jormungandr:app flask run &
352+
popd
351353

352354
jormun_pid=$!
353355

scripts/build_setup_and_run_navitia_demo.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,12 @@ sed "s,^INSTANCES_DIR.*,INSTANCES_DIR = '$run_dir/jormungandr'," "$navitia_dir"/
200200
#we also don't want to depend on the jormungandr database for this test
201201
sed -i 's/DISABLE_DATABASE.*/DISABLE_DATABASE=False/' "$run_dir"/jormungandr/jormungandr_settings.py
202202

203-
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 &
203+
export JORMUNGANDR_CONFIG_FILE="$run_dir"/jormungandr/jormungandr_settings.py
204+
export PYTHONPATH="$navitia_dir/source/navitiacommon:$navitia_dir/source/jormungandr"
205+
export FLASK_APP=jormungandr:app
206+
pushd "$navitia_dir/source/jormungandr"
207+
flask run &
208+
popd
204209
jormun_pid=$!
205210

206211

source/jormungandr/readme.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Environment variables can be set when the service is started. Referer to [defaul
5050
example for a development environment:
5151

5252
```sh
53-
PYTHONPATH=..:../../navitiacommon/ JORMUNGANDR_INSTANCES_DIR=~/jormung_conf/ JORMUNGANDR_START_MONITORING_THREAD=False JORMUNGANDR_DISABLE_DATABASE=True JORMUNGANDR_IS_PUBLIC=True python manage.py runserver
53+
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
5454
```
5555

5656
## custom_settings.py
@@ -60,7 +60,7 @@ This helps you overwrite the default settings from a file. Prevent from mixing b
6060
Use `JORMUNGANDR_CONFIG_FILE` to tell where your file is located like:
6161

6262
```sh
63-
PYTHONPATH=..:../../navitiacommon/ JORMUNGANDR_INSTANCES_DIR=~/jormung_conf/ JORMUNGANDR_CONFIG_FILE=~/jormung_conf/jormung_settings.py python manage.py runserver
63+
PYTHONPATH=..:../../navitiacommon/ JORMUNGANDR_INSTANCES_DIR=~/jormung_conf/ JORMUNGANDR_CONFIG_FILE=~/jormung_conf/jormung_settings.py FLASK_APP=jormungandr:app flask run
6464
```
6565

6666
# Run
@@ -69,14 +69,14 @@ To run the web service, you'll need to:
6969

7070
* set `JORMUNGANDR_INSTANCES_DIR` to point at the directory that contains your `jormungandr.json`.
7171
* add `navitia/source/jormungandr` and `navitia/navitiacommon` to your python path via `PYTHONPATH`.
72-
* [optionaly] set `JORMUNGANDR_CONFIG_FILE` to point at your `custom_settings.py`.
72+
* [optionaly] set `JORMUNGANDR_CONFIG_FILE` to point at your `custom_settings.py`.
7373

7474
## Example
7575

7676
From `navitia/source/jormungandr/jormungandr` run :
7777

7878
```sh
79-
PYTHONPATH=..:../../navitiacommon/ JORMUNGANDR_INSTANCES_DIR=~/jormung_conf/ python manage.py runserver
79+
PYTHONPATH=..:../../navitiacommon/ JORMUNGANDR_INSTANCES_DIR=~/jormung_conf/ FLASK_APP=jormungandr:app flask run
8080
```
8181

8282
# Option

source/jormungandr/requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
Flask==1.1.1
22
git+https://github.com/CanalTP/flask-restful.git@76346f65ca12a8edb9b32688cdc192ad391fa686
33
Flask-SQLAlchemy==2.4
4-
Flask-Script==0.6.7
54
Flask-Cors==1.9.0
65
GeoAlchemy2==0.2.4
76
geojson==1.3.3

0 commit comments

Comments
 (0)