From c7de83a5d3159d938797245b195e10460bce328f Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 29 Oct 2017 10:14:11 +0100 Subject: Makefile: update town fixture generation --- .gitignore | 2 ++ Makefile.example | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a1984e0ff..9f8048044 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ ishtar.egg-info *.log example_project/ishtar example_project/.coverage +ishtar_common/fixtures/towns_norel-fr.json +ishtar_common/fixtures/towns-fr.json diff --git a/Makefile.example b/Makefile.example index b3016e8af..9a3e5ccb4 100644 --- a/Makefile.example +++ b/Makefile.example @@ -142,11 +142,13 @@ fixtures_common_importers: > '../ishtar_common/fixtures/initial_importtypes-'$(default_data)'.json' fixtures_common_towns: - cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 \ - ishtar_common.state \ + cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 --natural-primary --natural-foreign \ ishtar_common.department \ ishtar_common.town \ - > '../ishtar_common/fixtures/initial_towns-'$(default_data)'.json' + > '../ishtar_common/fixtures/towns-'$(default_data)'.json' + cat 'ishtar_common/fixtures/towns-'$(default_data)'.json' | tr '\n' '\r' | \ + sed -e 's/"children": *\[\r *\[\r *"[0-9]*", *\r *[0-9]*\ *\r *\]\r *\]/"children": []/g' | \ + tr '\r' '\n' > 'ishtar_common/fixtures/towns_norel-'$(default_data)'.json' fixtures_spatialrefsystem: cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 --natural-primary --natural-foreign \ -- cgit v1.2.3