diff --git a/src/aggregate_loader.py b/src/aggregate_loader.py index 7d6cd2b5..e16461a8 100644 --- a/src/aggregate_loader.py +++ b/src/aggregate_loader.py @@ -1,9 +1,11 @@ import logging, coloredlogs, os, multiprocessing, time, argparse, time + from etl import * from etl.helpers import Neo4jHelper from transactors import Neo4jTransactor, FileTransactor from data_manager import DataFileManager -from common import ContextInfo +from common import ContextInfo # Must be the last timeport othersize program fails + parser = argparse.ArgumentParser(description='Load data into the Neo4j database for the Alliance of Genome Resources.') parser.add_argument('-c', '--config', help='Specify the filename of the YAML config. It must reside in the src/config/ directory', default='default.yml') diff --git a/src/etl/mi_etl.py b/src/etl/mi_etl.py index f986ca27..fe218d17 100644 --- a/src/etl/mi_etl.py +++ b/src/etl/mi_etl.py @@ -1,11 +1,13 @@ import logging -logger = logging.getLogger(__name__) - -import urllib, json, sys +import urllib, json from etl import ETL from transactors import CSVTransactor, Neo4jTransactor +logger = logging.getLogger(__name__) + + + class MIETL(ETL): query_template = """ diff --git a/src/transactors/file_transactor.py b/src/transactors/file_transactor.py index 40ca28e7..14f6fb30 100644 --- a/src/transactors/file_transactor.py +++ b/src/transactors/file_transactor.py @@ -1,7 +1,9 @@ import logging import multiprocessing from time import sleep -from etl import * + +from etl import ETL + logger = logging.getLogger(__name__) diff --git a/src/transactors/neo4j_transactor.py b/src/transactors/neo4j_transactor.py index e97f2823..88932896 100644 --- a/src/transactors/neo4j_transactor.py +++ b/src/transactors/neo4j_transactor.py @@ -3,10 +3,11 @@ import os import pickle import time -from etl import * from neo4j.v1 import GraphDatabase +from etl import ETL + logger = logging.getLogger(__name__)