shareddata 6.85.14__tar.gz → 6.85.17__tar.gz

{shareddata-6.85.14/src/shareddata.egg-info → shareddata-6.85.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shareddata
-Version: 6.85.14
+Version: 6.85.17
 Summary: Memory Mapped / Shared Memory Database with S3 repository
 Home-page: https://shareddata.net
 Author: shareddata

{shareddata-6.85.14 → shareddata-6.85.17}/setup.py

@@ -66,7 +66,7 @@ test_requires = [
 
 setup(
     name='shareddata',
-    version='6.85.14',
+    version='6.85.17',
     description='Memory Mapped / Shared Memory Database with S3 repository',
     author='shareddata',
     author_email='admin@shareddata.net',

{shareddata-6.85.14 → shareddata-6.85.17}/src/SharedData/Routines/JobStore.py

@@ -285,7 +285,7 @@ def active(now=None):
 
 
 # What a list of jobs can be grouped by: the columns (SQL) that make a group, by name.
-GROUPS = {'time': ('minute', 'repo', 'branch', 'routine'), 'routine': ('repo', 'branch', 'routine'), 'status': ('status',), 'computer': ('computer',)}
+GROUPS = {'time': ('minute', 'repo', 'branch', 'routine'), 'routine': ('repo', 'branch', 'routine'), 'repo': ('repo',), 'status': ('status',), 'computer': ('computer',)}
 _GROUP_SQL = {'minute': 'substr(date, 1, 16)', 'repo': "COALESCE(repo, '')", 'branch': "COALESCE(branch, '')", 'routine': "COALESCE(routine, '')",
               'status': 'status', 'computer': "COALESCE(target, computer, '')"}
 
@@ -333,7 +333,7 @@ def find(month=None, statuses=None, text=None, limit=200, offset=0, now=None, gr
 
 def groups(by='time', month=None, statuses=None, text=None, limit=500, now=None):
     """The groups of a list without their jobs: how many jobs of each status every group has.
-    by: 'time' (the minute a job is due, with its routine), 'routine', 'status' or 'computer'.
+    by: 'time' (the minute a job is due, with its routine), 'routine', 'repo', 'status' or 'computer'.
     -> {'groups': [{'key': {...}, 'counts': {status: n}, 'total': n}], 'groups_total': n,
         'total': n, 'counts': {status: n}, 'months': [...]}; oldest minute first, then by name."""
     if by not in GROUPS: