Skip to content
Browse files

Merge https://github.com/chapmanb/cloudbiolinux

  • Loading branch information...
2 parents b69086c + 7609f92 commit b0c297fe09852d5a625ea3ad7a1b38073239e1d4 @jmchilton committed Mar 8, 2012
Showing with 4 additions and 14 deletions.
  1. +4 −14 data_fabfile.py
View
18 data_fabfile.py
@@ -31,29 +31,19 @@
except ImportError:
boto = None
-# use local cloudbio directory
+# preferentially use local cloudbio directory
for to_remove in [p for p in sys.path if p.find("cloudbiolinux-") > 0]:
sys.path.remove(to_remove)
sys.path.append(os.path.dirname(__file__))
+# allow partial use without cloudbiolinux installed or present
try:
from cloudbio.biodata.dbsnp import download_dbsnp
-except ImportError:
- download_dbsnp = None
-
-try:
from cloudbio.biodata.rnaseq import download_transcripts
-except ImportError:
- download_transcripts = None
-
-try:
from cloudbio.distribution import _setup_distribution_environment
-except ImportError:
- _setup_distribution_environment = None
-
-try:
from cloudbio.utils import _setup_logging
except ImportError:
- _setup_logging = None
+ download_dbsnp, download_transcripts, _setup_distribution_environment, _setup_logging = \
+ (None, None, None, None)
# -- Host specific setup

0 comments on commit b0c297f

Please sign in to comment.
Something went wrong with that request. Please try again.