diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 17:57:28 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 17:57:28 +0100 |
| commit | 6979f76c94daae084eb0c5525e1a65734c97555f (patch) | |
| tree | 4d94e87afaecbd96e5cb317ce019c84020f97895 /Makefile.example | |
| parent | b60a1e62355695783e25b0f8054aaab7d40b73e0 (diff) | |
| parent | 29a7c801110121f51268df69fbe604b116d44472 (diff) | |
| download | Ishtar-6979f76c94daae084eb0c5525e1a65734c97555f.tar.bz2 Ishtar-6979f76c94daae084eb0c5525e1a65734c97555f.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'Makefile.example')
| -rw-r--r-- | Makefile.example | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/Makefile.example b/Makefile.example index df62fe0b1..cc6eac60f 100644 --- a/Makefile.example +++ b/Makefile.example @@ -161,7 +161,7 @@ fixtures_auth: auth.group \ > '../fixtures/initial_data-auth-'$(default_data)'.json' -fixtures_common: fixtures_common_importers fixtures_common_towns +fixtures_common: fixtures_common_importers fixtures_spatialrefsystem cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 \ ishtar_common.authortype \ ishtar_common.persontype \ @@ -169,6 +169,8 @@ fixtures_common: fixtures_common_importers fixtures_common_towns ishtar_common.sourcetype \ ishtar_common.operationtype \ ishtar_common.titletype \ + ishtar_common.supporttype \ + ishtar_common.format \ > '../ishtar_common/fixtures/initial_data-'$(default_data)'.json' fixtures_common_importers: @@ -190,6 +192,11 @@ fixtures_common_towns: ishtar_common.town \ > '../ishtar_common/fixtures/initial_towns-'$(default_data)'.json' +fixtures_spatialrefsystem: + cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 \ + ishtar_common.SpatialReferenceSystem \ + > '../ishtar_common/fixtures/initial_spatialrefsystem-'$(default_data)'.json' + fixtures_operations: cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 \ archaeological_operations.acttype \ @@ -213,10 +220,12 @@ fixtures_finds: cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 \ archaeological_finds.materialtype \ archaeological_finds.treatmenttype \ - archaeological_finds.ConservatoryState \ - archaeological_finds.PreservationType \ - archaeological_finds.ObjectType \ - archaeological_finds.IntegrityType \ + archaeological_finds.treatmentstate \ + archaeological_finds.conservatorystate \ + archaeological_finds.remarkabilitytype \ + archaeological_finds.preservationtype \ + archaeological_finds.objecttype \ + archaeological_finds.integritytype \ > '../archaeological_finds/fixtures/initial_data-'$(default_data)'.json' fixtures_warehouse: @@ -246,9 +255,11 @@ sdist: clean distribute_test: sdist twine upload -r pypitest dist/* + rm -rf ishtar.egg-info distribute_main: sdist twine upload -r pypi dist/* + rm -rf ishtar.egg-info deb: clean debuild -i -us -uc -b |