Merge branch 'master' of https://github.com/CMSCompOps/WorkflowWebTools into py3

Author: phylsix

.travis.yml

@@ -1,6 +1,12 @@
 language: python
-python: 2.7
-dist: trusty
+matrix:
+  include:
+    - dist: trusty
+      python: 2.7
+    - dist: xenial
+      python: 3.7
+      env:
+        - nodoc=true
 services:
   - mongodb
 env: TMPDIR=$PWD/tmp

docs/api.rst

@@ -16,7 +16,6 @@ From the URL root index, users will be able to directly access the following:
 - :ref:`global-view-ref`
 - :ref:`new-user-ref`
 - :ref:`reset-pass-ref`
-- :ref:`show-logs-ref`
 
 .. _global-view-ref:
 
@@ -53,13 +52,6 @@ Reporting Completed Actions
 
 .. automethod:: workflowtools.WorkflowTools.reportaction
 
-.. _show-logs-ref:
-
-Viewing Workflow Logs
-~~~~~~~~~~~~~~~~~~~~~
-
-.. automethod:: workflowtools.WorkflowTools.showlog
-
 .. _new-user-ref:
 
 Creating a New Account

docs/python_modules.rst

@@ -55,12 +55,6 @@ Manage Actions
 .. automodule:: WorkflowWebTools.manageactions
    :members:
 
-Show Log
-~~~~~~~~
-
-.. automodule:: WorkflowWebTools.showlog
-   :members:
-
 Classifying Errors
 ~~~~~~~~~~~~~~~~~~
 

setup.py

@@ -18,13 +18,13 @@
                                  'templates/*']
         },
     install_requires=[
-        'cmstoolbox>=0.11.3',
+        'cmstoolbox>=0.12.0',
         'more-itertools<6.0.0',
         'cherrypy<18.0.0',
         'mako',
         'numpy>=1.6.1',
         'scipy==1.1.0',
-        'sklearn',
+        'scikit-learn==0.20.3',
         'passlib>=1.6',
         'bcrypt',
         'pyOpenSSL',
@@ -35,6 +35,6 @@
         'cx_Oracle',
         'pandas',
         'keras',
-        'tensorflow'
+        'tensorflow<2.0'
         ]
     )

test/test_report_action.py

@@ -28,7 +28,7 @@ def setUp(self):
         self.coll = manageactions.get_actions_collection()
         # Check that test database is empty
         if self.coll.count() != 0:
-            print 'Test database not empty, abort!!'
+            print('Test database not empty, abort!!')
             exit(123)
 
         now = time.time()

test/test_workflowwebtools.py

@@ -237,11 +237,11 @@ def setUp(self):
         if os.path.exists('reasons.db'):
             os.remove('reasons.db')
 
-        print 'before', rm.reasons_list()
+        print('before', rm.reasons_list())
 
         rm.update_reasons(self.reasons)
 
-        print 'after', rm.reasons_list()
+        print('after', rm.reasons_list())
 
 
     def tearDown(self):
@@ -291,7 +291,7 @@ def setUp(self):
         rm.update_reasons(self.reasons1)
 
         if ma.get_actions_collection().count() != 0:
-            print 'Test database not empty, abort!!'
+            print('Test database not empty, abort!!')
             exit(123)
 
         file_name = WorkflowInfo(self.request_base['workflows']).cache_filename('workflow_params')

workflowwebtools/__init__.py

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

workflowwebtools/clusterworkflows.py

@@ -208,7 +208,7 @@ def get_clustered_group(workflow, clusterer, session=None):
     group = predictions.get(workflow)
 
     if group is not None:
-        for wkf, cluster in predictions.iteritems():
+        for wkf, cluster in predictions.items():
             if cluster == group and wkf != workflow:
                 output.append(wkf)
 

workflowwebtools/errorutils.py

@@ -10,7 +10,10 @@
 import os
 import json
 import re
-import urlparse
+try:
+    import urlparse
+except ImportError:
+    import urllib.parse as urlparse # pylint: disable=import-error
 
 import validators
 import cherrypy
@@ -82,12 +85,11 @@ def open_location(data_location):
     if raw is None:
         return raw
 
-    keys = raw.keys()
-    if not (keys and isinstance(raw[keys[0]], list)):
+    if not (raw and isinstance(raw[list(raw)[0]], list)):
         return raw
 
     return errors_from_list([
-        workflow for workflow, statuses in raw.iteritems()
+        workflow for workflow, statuses in raw.items()
         if True in ['manual' in status for status in statuses]
     ])
 

workflowwebtools/globalerrors.py

@@ -118,7 +118,7 @@ def setup(self):
         if not self.data_location:
             current_workflows = self.return_workflows()
 
-            prep_ids = set([self.get_workflow(wf).get_prep_id() for wf in current_workflows])
+            prep_ids = {self.get_workflow(wf).get_prep_id() for wf in current_workflows}
 
             other_workflows = sum([self.get_prepid(prep_id).get_workflows() \
                                        for prep_id in prep_ids], [])
@@ -405,20 +405,20 @@ def group_errors(input_errors, grouping_function, **kwargs):
 
     output = default_errors_format()
 
-    for subgroup, values in input_errors.iteritems():
+    for subgroup, values in input_errors.items():
 
         group = grouping_function(subgroup)
 
         # We have three variables for everything, so we can write this by hand
         # Not ideal
-        for row, row_val in values['errors'].iteritems():
-            for col, numerrors in row_val.iteritems():
+        for row, row_val in values['errors'].items():
+            for col, numerrors in row_val.items():
                 output[group]['errors'][row][col] += numerrors
 
         output[group]['sub'][subgroup] = values
         output[group]['total'] += values['total']
 
-        for key, func in kwargs.iteritems():
+        for key, func in kwargs.items():
             output[group][key] = func(group)
 
     return output