Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

diff --git a/docs/v0.5.4_to_v0.5.5.sql b/docs/v0.5.4_to_v0.5.5.sql
new file mode 100644 (file)
index 0000000..3b6b8ff
--- /dev/null
+++ b/docs/v0.5.4_to_v0.5.5.sql
@@ -0,0 +1,5 @@
+drop table experiments_sequencer;
+drop table experiments_datafile;
+drop table experiments_datarun;
+alter table experiments_clusterstation add column isdefault bool not null default false;
+select "dont forget to syncdb";
\ No newline at end of file

diff --git a/htsworkflow/settings.py b/htsworkflow/settings.py
index 7af5ac484f5e612dde288e3e4519215a031c9e83..1a3ede711f5dd359c477f60f70d1311cf29412bc 100644 (file)
--- a/htsworkflow/settings.py
+++ b/htsworkflow/settings.py
@@ -28,6 +28,7 @@ The options understood by this module are (with their defaults):
 
 """
 import ConfigParser
+import logging
 import os
 import shlex
 import htsworkflow
@@ -37,6 +38,7 @@ from django.conf import global_settings
 from htsworkflow.util.api import make_django_secret_key
 
 HTSWORKFLOW_ROOT = os.path.abspath(os.path.split(htsworkflow.__file__)[0])
+LOGGER = logging.getLogger(__name__)
 
 # make epydoc happy
 __docformat__ = "restructuredtext en"