From ad82d615f206861570f08ab7942343d5d64cb7f3 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 13 Apr 2016 15:30:09 +0200 Subject: [PATCH] bugfix --- app/scripts/worker.sh | 3 +-- doc/content/ICTM2016.rst | 11 +++++++++++ doc/content/TM-1.6.rst | 2 +- setup.py | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 doc/content/ICTM2016.rst diff --git a/app/scripts/worker.sh b/app/scripts/worker.sh index 1fc3672f..76bb4652 100644 --- a/app/scripts/worker.sh +++ b/app/scripts/worker.sh @@ -9,8 +9,7 @@ wsgi=$app'/wsgi.py' # pip install django-environ redis # waiting for other services -sh $app/scripts/w -ait.sh +sh $app/scripts/wait.sh # Starting celery worker with the --autoreload option will enable the worker to watch for file system changes # This is an experimental feature intended for use in development only diff --git a/doc/content/ICTM2016.rst b/doc/content/ICTM2016.rst new file mode 100644 index 00000000..359bd6a9 --- /dev/null +++ b/doc/content/ICTM2016.rst @@ -0,0 +1,11 @@ +Telemeta at the 21st Symposium of the ICTM Study Group on Historical Sources of Traditional Music +####################################################################################################### + +:category: Research + +Telemeta and the DIADEMS team participate to the `21st Symposium of the ICTM Study Group on Historical Sources of Traditional Music `_ (ICTM) will take place on 9-13 March 2016 in Paris, France, by invitation of Susanne Fürniss, MNHN. The conference site is the Musée de l’Homme, and the Meeting is hosted by the Musée National d'Histoire Naturelle (MNHN). + +Topics + +1. Evaluation of historical sound recordings +2. The study of history through oral and written sources on music diff --git a/doc/content/TM-1.6.rst b/doc/content/TM-1.6.rst index b5e550c4..47519091 100644 --- a/doc/content/TM-1.6.rst +++ b/doc/content/TM-1.6.rst @@ -1,4 +1,4 @@ - Telemeta 1.6 is finally out! +Telemeta 1.6 is finally out! ############################ :category: Releases diff --git a/setup.py b/setup.py index b7f4e241..43d83d62 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ setup( long_description = open('README.rst').read(), author = "Guillaume Pellerin", author_email = "yomguy@parisson.com", - version = '1.6', + version = '1.6.1', install_requires = [ 'django==1.6.11', 'django-registration==1.0', -- 2.39.5