diff options
| author | zsloan | 2018-02-28 16:45:31 +0000 |
|---|---|---|
| committer | zsloan | 2018-02-28 16:45:31 +0000 |
| commit | 1e0a0739483ca192c50ec953850a02130b76df72 (patch) | |
| tree | 300ab3b58d3d6a25fe1e696f9ee9c15de78f121e /wqflask/base | |
| parent | 59a6b89f1d14ac542a80ed8c1901c1aae0ba7103 (diff) | |
| parent | f44a18ccd4c45ab7fd2179c9000d1bf836e3f654 (diff) | |
| download | genenetwork2-1e0a0739483ca192c50ec953850a02130b76df72.tar.gz | |
Merge branch 'testing' of https://github.com/genenetwork/genenetwork2
Diffstat (limited to 'wqflask/base')
| -rw-r--r-- | wqflask/base/data_set.py | 2 | ||||
| -rw-r--r-- | wqflask/base/webqtlConfig.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py index 6649f8af..a4eaaa2e 100644 --- a/wqflask/base/data_set.py +++ b/wqflask/base/data_set.py @@ -332,7 +332,7 @@ class DatasetGroup(object): if check_plink_gemma(): marker_class = HumanMarkers else: - marker_class = Markers + marker_class = Markers if self.genofile: self.markers = marker_class(self.genofile[:-5]) diff --git a/wqflask/base/webqtlConfig.py b/wqflask/base/webqtlConfig.py index 1ef2bc26..1e66e957 100644 --- a/wqflask/base/webqtlConfig.py +++ b/wqflask/base/webqtlConfig.py @@ -82,6 +82,7 @@ assert_writable_dir(GENERATED_TEXT_DIR) # Flat file directories GENODIR = flat_files('genotype')+'/' assert_dir(GENODIR) +assert_dir(GENODIR+'bimbam') # for gemma # JSON genotypes are OBSOLETE JSON_GENODIR = flat_files('genotype/json')+'/' |