django-nose didn't work with django 1.1, so I went back to the nose plugin NoseDjango

[htsworkflow.git] / htsworkflow / frontend / experiments / models.py

diff --git a/htsworkflow/frontend/experiments/models.py b/htsworkflow/frontend/experiments/models.py
index 10599e2174c0330cd2e16908bdf602179ac6f943..8a71e252331c600ce12eeaea8b20511f337ad98c 100755 (executable)
--- a/htsworkflow/frontend/experiments/models.py
+++ b/htsworkflow/frontend/experiments/models.py
@@ -5,7 +5,8 @@ from django.core import urlresolvers
 from django.db import models
 
 from htsworkflow.frontend.samples.models import *
-from htsworkflow.frontend.settings import options
+#from htsworkflow.frontend.settings import options
+from django.conf import settings
 
 class ClusterStation(models.Model):
   name = models.CharField(max_length=50, unique=True)
@@ -21,7 +22,7 @@ class Sequencer(models.Model):
 
 default_pM = 5
 try:
-  default_pM = int(options.get('frontend', 'default_pm'))
+  default_pM = int(settings.DEFAULT_PM)
 except ValueError,e:
   logging.error("invalid value for frontend.default_pm")