Merge pull request #134 from dabercro/v10

Final v0.10 changes

Author: Daniel Abercrombie

.travis.yml

@@ -13,4 +13,5 @@ env: TMPDIR=$PWD/tmp
 install:
   - pip install .
 script:
+  - pip list
   - package=workflowwebtools opsspace-test

docs/requirements.txt

@@ -1,5 +1,6 @@
-sphinx
+sphinx<2
 sphinx_rtd_theme
 sphinxcontrib-programoutput
 sphinxcontrib-autoanysrc
 -r ../workflowmonit/requirements.txt
+tensorflow  # This should probably be installed separately for production

setup.py

@@ -23,19 +23,18 @@
         'more-itertools<6.0.0',
         'cherrypy<18.0.0',
         'mako',
-        'numpy>=1.6.1',
-        'scipy==1.1.0',
-        'scikit-learn==0.20.3',
+        'numpy>=1.14.5,<1.17',
+        'scikit-learn',
         'passlib>=1.6',
         'bcrypt',
         'pyOpenSSL',
-        'pyyaml',
+        'pytest>=4.4.2,<5.0'
+        'pyyaml>=5.1',
         'validators',
         'tabulate',
         'pymongo<3.5.0',
         'cx_Oracle',
-        'pandas',
-        'keras',
-        'tensorflow<2.0'
+        'pandas<0.25.0',
+        'keras'
         ]
     )

workflowwebtools/__init__.py

@@ -4,6 +4,6 @@
 :author: Daniel Abercrombie <[email protected]>
 """
 
-__version__ = '0.10.0'
+__version__ = '0.10.2'
 
 __all__ = []

workflowwebtools/manageactions.py

@@ -182,12 +182,13 @@ def submitaction(user, workflows, action, session=None, **kwargs):
     return workflows, reasons, params
 
 
-def submit2(documents): # pylint: disable=missing-docstring
+def submit2(user, documents): # pylint: disable=missing-docstring
     coll = get_actions_collection()
 
     for document in documents:
         workflow = document['workflow']
         params = document['parameters']
+        params['user'] = user
 
         cherrypy.log('About to insert workflow: %s action: %s' % (workflow, params))
 

workflowwebtools/workflowtools.py

@@ -215,7 +215,7 @@ def getworkflows(self, prepid):
     @cherrypy.tools.json_out()
     def submit2(self):
         input_json = cherrypy.request.json
-        manageactions.submit2(input_json['documents'])
+        manageactions.submit2(cherrypy.request.login, input_json['documents'])
         self.update_statuses()
         return {'message': 'Done'}