diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
| commit | 7924c43af9044cfd40f36bd8a84378417223d95b (patch) | |
| tree | 78197ea5c36baaff4fcc1a53580eb3d586630b39 /Makefile.example | |
| parent | 54b87741a26a2bd805ed32200b082ca07ee0e27d (diff) | |
| parent | 0bdaa7c90017b436b3baf026c9710a8d49c9420a (diff) | |
| download | Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.tar.bz2 Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.zip | |
Merge branch 'master' into v0.9
Conflicts:
ishtar_common/migrations/0053_auto__add_field_ishtarsiteprofile_currency.py
Diffstat (limited to 'Makefile.example')
| -rw-r--r-- | Makefile.example | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Makefile.example b/Makefile.example index 32bf03f9a..4febeea65 100644 --- a/Makefile.example +++ b/Makefile.example @@ -47,6 +47,17 @@ update: clean syncdb compilemessages collectstatic test: clean cd $(project); $(PYTHON) manage.py test $(apps) +test_gitlab: clean + # test migrations + cd $(project); $(PYTHON) ./manage.py syncdb --noinput + # only necessary on master + cd $(project); $(PYTHON) ./manage.py migrate ishtar_common + cd $(project); $(PYTHON) ./manage.py migrate archaeological_files 0013 + cd $(project); $(PYTHON) ./manage.py migrate archaeological_operations 0040 + cd $(project); $(PYTHON) ./manage.py migrate archaeological_files + cd $(project); $(PYTHON) ./manage.py migrate + cd $(project); $(PYTHON) manage.py test $(apps) + pep8: pep8 --filename=*.py --ignore=W --exclude="manage.py,settings.py,migrations" --statistics --repeat . |