Merge branch 'pass-user' into user

Author: Daniel Abercrombie

setup.py

@@ -23,8 +23,7 @@
         'cherrypy<18.0.0',
         'mako',
         'numpy>=1.14.5,<1.17',
-        'scipy==1.1.0',
-        'scikit-learn==0.20.3',
+        'scikit-learn',
         'passlib>=1.6',
         'bcrypt',
         'pyOpenSSL',
@@ -35,7 +34,6 @@
         'pymongo<3.5.0',
         'cx_Oracle',
         'pandas<0.25.0',
-        'keras',
-        'tensorflow<2.0'
+        'keras'
         ]
     )

workflowwebtools/__init__.py

@@ -4,6 +4,6 @@
 :author: Daniel Abercrombie <dabercro@mit.edu>
 """
 
-__version__ = '0.10.1'
+__version__ = '0.10.2'
 
 __all__ = []

workflowwebtools/manageactions.py

@@ -188,13 +188,13 @@ def submit2(user, documents): # pylint: disable=missing-docstring
     for document in documents:
         workflow = document['workflow']
         params = document['parameters']
+        params['user'] = user
 
         cherrypy.log('About to insert workflow: %s action: %s' % (workflow, params))
 
         coll.update_one({'workflow': workflow},
                         {'$set':
                              {'timestamp': int(time.time()),
-                              'user': user,
                               'parameters': params,
                               'acted': 0}},
                         upsert=True)