Merge branch 'develop' of https://github.com/DDMAL/Rodan into develop

.touch

@@ -0,0 +1 @@
+.touch

.travis.yml

@@ -0,0 +1,17 @@
+language: python
+branches:
+    only:
+        - develop
+git:
+    submodules: false
+services: sqlite3
+python:
+    - "2.7"
+install: 
+    - pip install https://www.djangoproject.com/download/1.7.b4/tarball/
+    - pip install -r requirements.txt
+before_script: 
+    - mv rodan/settings_production.py.example rodan/settings_production.py
+    - python manage.py makemigrations rodan
+    - python manage.py syncdb --noinput
+script: python manage.py test

requirements.txt

@@ -1,4 +1,3 @@
-https://www.djangoproject.com/download/1.7.b4/tarball/
 Pillow==2.4.0
 Werkzeug==0.9.4
 amqp==1.4.5

rodan/__init__.py

@@ -3,4 +3,3 @@
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app
-import rodan.jobs

rodan/fixtures/2_initial_data.json

@@ -131,7 +131,7 @@
       "job": "76753dd66e1147bcbd6321d749518da2"
     },
     "model": "rodan.workflowjob",
-    "pk": "a21f510a16c24701ac0e435b3f4c20f2"
+    "pk": "a21f510a16c24701ac0e435b3f4c20f3"
   },
   {
     "fields": {
@@ -150,7 +150,7 @@
     "fields": {
       "updated": "2014-05-17T17:41:37.179Z",
       "created": "2014-05-17T17:41:37.179Z",
-      "result": "/Users/ahankins/Documents/code/git/Rodan/rodan/uploads/projects/9e8e928b4ec24a09b6113f1b0af1ea53/workflows/df78a1aa79554abcb5f1b0ac7bba2bad/runs/eb4b3661be2a44908c4c932b0783bb3e/1_3d558414db10427d82efdd9b9cb985bf/78f4f3d07e1748538fc3b57b1d54daba.png",
+      "result": "/Users/rberkow/Documents/code/Rodan/rodan/uploads/projects/9e8e928b4ec24a09b6113f1b0af1ea53/workflows/df78a1aa79554abcb5f1b0ac7bba2bad/runs/eb4b3661be2a44908c4c932b0783bb3e/1_3d558414db10427d82efdd9b9cb985bf/79fbc0e2e0484ff9af95a3286a719dad.jpg",
       "run_job": "3d558414db10427d82efdd9b9cb985bf",
       "result_type": null,
       "processed": true
@@ -164,11 +164,11 @@
       "name": "ineedsleep.png",
       "page_order": 1,
       "creator": 1,
-      "page_image": "/Users/ahankins/Documents/code/git/Rodan/rodan/uploads/projects/9e8e928b4ec24a09b6113f1b0af1ea53/pages/2f63f986449349769d7a313e0fc6edb3/original_file.png",
+      "page_image": "/Users/rberkow/Documents/code/Rodan/rodan/uploads/projects/9e8e928b4ec24a09b6113f1b0af1ea53/pages/ca0c9839e3a24a91a4552db9b2878770/original_file.jpg",
       "created": "2014-05-17T17:35:16.940Z",
       "project": "9e8e928b4ec24a09b6113f1b0af1ea53",
       "processed": true,
-      "compat_page_image": "/Users/ahankins/Documents/code/git/Rodan/rodan/uploads/projects/9e8e928b4ec24a09b6113f1b0af1ea53/pages/2f63f986449349769d7a313e0fc6edb3/compat_file.png"
+      "compat_page_image": "/Users/rberkow/Documents/code/Rodan/rodan/uploads/projects/9e8e928b4ec24a09b6113f1b0af1ea53/pages/ca0c9839e3a24a91a4552db9b2878770/compat_file.jpg"
     },
     "model": "rodan.page",
     "pk": "2f63f986449349769d7a313e0fc6edb3"
@@ -186,6 +186,19 @@
     "model": "rodan.workflowrun",
     "pk": "eb4b3661be2a44908c4c932b0783bb3e"
   },
+  {
+    "fields": {
+      "test_run": false,
+      "run": 2,
+      "creator": 1,
+      "created": "2014-05-17T17:40:57.439Z",
+      "updated": "2014-05-17T17:41:37.181Z",
+      "workflow": "df78a1aa79554abcb5f1b0ac7bba2bad",
+      "cancelled": true
+    },
+    "model": "rodan.workflowrun",
+    "pk": "4b1a0d13b2cd48a5a99324d7308ca27a"
+  },
   {
     "fields": {
       "status": 0,

rodan/jobs/__init__.py

@@ -115,23 +115,17 @@
 except ImportError as e:
     logger.warning("Custom Segmentation job not installed. Skipping. {0}".format(e))
 
-try:
-    from rodan.jobs.gamera.custom.neume_classification import module_loader
-    module_loader.load_module()
-except ImportError as e:
-    logger.warning("Custom Classification job not installed. Skipping. {0}".format(e))
-
 try:
     from rodan.jobs.gamera.custom.staff_removal import module_loader
     module_loader.load_module()
 except ImportError as e:
     logger.warning("Custom RT Staff Removal job not installed. Skipping. {0}".format(e))
 
-try:
-    from rodan.jobs.gamera.custom.pitch_finding import module_loader
-    module_loader.load_module()
-except ImportError as e:
-    logger.warning("Custom Pitch Finding job not installed. Skipping. {0}".format(e))
+# try:
+#     from rodan.jobs.gamera.custom.pitch_finding import module_loader
+#     module_loader.load_module()
+# except ImportError as e:
+#     logger.warning("Custom Pitch Finding job not installed. Skipping. {0}".format(e))
 
 try:
     from rodan.jobs.neon import module_loader

rodan/jobs/devel/dummy_job.py

@@ -1,5 +1,5 @@
 from rodan.models.job import Job
-from rodan.jobs.devel import celery_task
+from rodan.jobs.devel.celery_task import dummy_job
 
 
 def load_dummy_job():