From 1292d94abbf2e10698344dd98b7d887ea6bc5221 Mon Sep 17 00:00:00 2001 From: zsloan Date: Wed, 21 Sep 2022 18:42:13 +0000 Subject: Added Markers/HumanMarkers import to datasetgroup.py and removed it from __init__.py Previously it threw an error when it tried to use Markers/HumanMarkers in datasetgroup.py; since Markers/HumanMarkers doesn't seem to be used anywhere else, I think it's okay for the import to only be in datasetgroup.py --- wqflask/base/data_set/__init__.py | 1 - wqflask/base/data_set/datasetgroup.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/wqflask/base/data_set/__init__.py b/wqflask/base/data_set/__init__.py index 4667d5ce..7f0673de 100644 --- a/wqflask/base/data_set/__init__.py +++ b/wqflask/base/data_set/__init__.py @@ -15,7 +15,6 @@ from .datasettype import DatasetType from .tempdataset import TempDataSet from .datasetgroup import DatasetGroup from .utils import query_table_timestamp -from .markers import Markers, HumanMarkers from .genotypedataset import GenotypeDataSet from .phenotypedataset import PhenotypeDataSet from .mrnaassaydataset import MrnaAssayDataSet diff --git a/wqflask/base/data_set/datasetgroup.py b/wqflask/base/data_set/datasetgroup.py index a13d2f93..2861b23d 100644 --- a/wqflask/base/data_set/datasetgroup.py +++ b/wqflask/base/data_set/datasetgroup.py @@ -5,6 +5,7 @@ import json from base import webqtlConfig +from .markers import Markers, HumanMarkers from utility import webqtlUtil from utility import gen_geno_ob from db import webqtlDatabaseFunction -- cgit v1.2.3