Merge branch 'dev' of lab/parse-edi into master

healthcareio/server/__init__.py

@@ -8,7 +8,7 @@ import smart
 import transport
 import pandas as pd
 import numpy as np
-import x12
+from healthcareio import x12
 
 from multiprocessing import Process
 from flask_socketio import SocketIO, emit, disconnect,send

healthcareio/server/proxy.py

@@ -4,10 +4,10 @@
 import os
 import transport
 import numpy as np
-import x12
+from healthcareio import x12
 import pandas as pd
 import smart
-from analytics import Apex
+from healthcareio.analytics import Apex
 import time
 class get :
     PROCS = []

setup.py

@@ -8,14 +8,14 @@ import sys
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read() 
 args = {
-    "name":"healthcareio","version":"1.4.0",
+    "name":"healthcareio","version":"1.4.2",
     "author":"Vanderbilt University Medical Center",
     "author_email":"steve.l.nyemba@vumc.org",
     "license":"MIT",
     "packages":find_packages(),
     "keywords":["healthcare","edi","x12","analytics","835","837","data","transport","protocol"]
 }
-args["install_requires"] = ['seaborn','jinja2', 'weasyprint','data-transport@git+https://dev.the-phi.com/git/steve/data-transport.git','pymongo','numpy','cloudant','pika','boto','flask-session','smart_open']
+args["install_requires"] = ['flask-socketio','seaborn','jinja2', 'weasyprint','data-transport@git+https://dev.the-phi.com/git/steve/data-transport.git','pymongo','numpy','cloudant','pika','boto','flask-session','smart_open','https://dev.the-phi.com/git/steve/monitor.git@data-collector']
 args['url'] = 'https://hiplab.mc.vanderbilt.edu'
 args['scripts']= ['healthcareio/healthcare-io.py']
 # args['entry_points'] = {