fix db and celery script, add timeside urls

diff --git a/Dockerfile b/Dockerfile
index 65be1b9d7c7465517620d4aaabe7beb1a062fd82..727be97393bf3ea11745d2ac25d4b25ca6c55a7e 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM parisson/timeside-diadems:latest-dev
+# FROM parisson/timeside:latest-dev
+FROM timeside_app
 
 MAINTAINER Guillaume Pellerin <yomguy@parisson.com>, Thomas fillon <thomas@parisson.com>
 

diff --git a/docker-compose.yml b/docker-compose.yml
index 205cf7f5ab7ae4da9e2fb30d6369b0a76e8f4e2d..6cb690e1f5fb28d2261bfbc8be7494aa00dfe074 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -72,7 +72,7 @@ worker:
   build: .
   volumes_from:
     - home
-  command: /bin/sh /opt/TimeSide/examples/deploy/celery_app.sh
+  command: /bin/sh /opt/Telemeta/examples/deploy/celery_app.sh
   links:
     - rabbitmq
     - db

diff --git a/examples/sandbox/settings.py b/examples/sandbox/settings.py
index d1681fb7a2e0afd2a8ff85873ae235fc27ce389d..97cf812d7a2348ede65c5979adc498214644def2 100644 (file)
--- a/examples/sandbox/settings.py
+++ b/examples/sandbox/settings.py
@@ -33,7 +33,7 @@ DATABASES = {
         'ENGINE': 'django.db.backends.mysql',  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'USER': 'root',      # Not used with sqlite3.
         'PASSWORD': 'mysecretpassword',  # Not used with sqlite3.
-        'NAME': 'timeside',
+        'NAME': 'telemeta',
         'HOST': 'db',      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '3306',      # Set to empty string for default. Not used with sqlite3.
     }

diff --git a/setup.py b/setup.py
index 80d0be51524dfac5893c5068ca304541bd679542..92390c0e29d321ed87bd22185bfe1bfdde905452 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -24,6 +24,7 @@ class PyTest(TestCommand):
         errno = pytest.main(self.pytest_args)
         sys.exit(errno)
 
+
 CLASSIFIERS = ['Environment :: Web Environment',
 'Framework :: Django',
 'Intended Audience :: Science/Research',
@@ -62,6 +63,7 @@ setup(
         'django-suit',
         'django-google-tools',
         'django-ipauth',
+        'django-celery',
         'timeside>=0.7',
         'south',
         'sorl-thumbnail',
@@ -69,13 +71,11 @@ setup(
         'psutil',
         'pyyaml',
         'python-ebml',
-        # 'mysql',
         'zipstream',
     ],
   tests_require=['pytest-django', 'pytest-cov', 'factory-boy'],
   # Provide a test command through django-setuptest
   cmdclass={'test': PyTest},
-  dependency_links = ['https://github.com/yomguy/django-json-rpc/tarball/0.6.2#egg=django-json-rpc-0.6.2'],
   platforms=['OS Independent'],
   license='CeCILL v2',
   classifiers = CLASSIFIERS,

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 8550588b4ef74f1240eec4718968ce3c606f3a05..dc292e0a131c95ee40450b42d4350b0193e90aa0 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -230,6 +230,8 @@ urlpatterns = patterns('',
 
     url(r'^', include('jqchat.urls')),
 
+    url(r'^timeside/', include('timeside.server.urls')),
+
 )