meerschaum 2.1.3.dev2__py3-none-any.whl → 2.1.3.dev3__py3-none-any.whl

meerschaum/_internal/entry.py

@@ -118,6 +118,7 @@ def entry_with_args(
     return result
 
 
+_shells = []
 _shell = None
 def get_shell(
         sysargs: Optional[List[str]] = None,
@@ -141,4 +142,6 @@ def get_shell(
             _shell = shell_pkg.Shell(actions, sysargs=sysargs)
         elif reload:
             _shell.__init__()
+
+        _shells.append(_shell)
     return _shell

meerschaum/_internal/shell/Shell.py

@@ -64,6 +64,10 @@ reserved_completers = {
     'instance', 'repo'
 }
 
+### To handle dynamic reloading, store shell attributes externally.
+### This is because the shell object address gets lost upon reloads.
+shell_attrs = {}
+
 def _insert_shell_actions(
         _shell: Optional['Shell'] = None,
         actions: Optional[Dict[str, Callable[[Any], SuccessTuple]]] = None,
@@ -229,7 +233,7 @@ class Shell(cmd.Cmd):
             pass
 
         from meerschaum.config._paths import SHELL_HISTORY_PATH
-        self.session = prompt_toolkit_shortcuts.PromptSession(
+        shell_attrs['session'] = prompt_toolkit_shortcuts.PromptSession(
             history = prompt_toolkit_history.FileHistory(str(SHELL_HISTORY_PATH)),
             auto_suggest = ValidAutoSuggest(),
             completer = ShellCompleter(),
@@ -260,15 +264,15 @@ class Shell(cmd.Cmd):
                 pass
 
         ### NOTE: custom actions must be added to the self._actions dictionary
-        self._actions = actions
-        self._sysargs = sysargs
-        self._actions['instance'] = self.do_instance
-        self._actions['repo'] = self.do_repo
-        self._actions['debug'] = self.do_debug
-        self._update_bottom_toolbar = True
-        self._old_bottom_toolbar = ''
-        self.debug = False
-        self._reload = True
+        shell_attrs['_actions'] = actions
+        shell_attrs['_sysargs'] = sysargs
+        shell_attrs['_actions']['instance'] = self.do_instance
+        shell_attrs['_actions']['repo'] = self.do_repo
+        shell_attrs['_actions']['debug'] = self.do_debug
+        shell_attrs['_update_bottom_toolbar'] = True
+        shell_attrs['_old_bottom_toolbar'] = ''
+        shell_attrs['debug'] = False
+        shell_attrs['_reload'] = True
         self.load_config()
         self.hidden_commands = []
         ### update hidden commands list (cmd2 only)
@@ -286,7 +290,7 @@ class Shell(cmd.Cmd):
         from meerschaum.utils.misc import remove_ansi
         from meerschaum.utils.formatting import CHARSET, ANSI, UNICODE, colored
         
-        if self.__dict__.get('intro', None) != '':
+        if shell_attrs.get('intro', None) != '':
             self.intro = get_config('shell', CHARSET, 'intro', patch=patch)
             self.intro += '\n' + ''.join(
                 [' '
@@ -297,25 +301,30 @@ class Shell(cmd.Cmd):
             ) + 'v' + version
         else:
             self.intro = ""
-        self._prompt = get_config('shell', CHARSET, 'prompt', patch=patch)
-        self.prompt = self._prompt
-        self.ruler = get_config('shell', CHARSET, 'ruler', patch=patch)
-        self.close_message = get_config('shell', CHARSET, 'close_message', patch=patch)
-        self.doc_header = get_config('shell', CHARSET, 'doc_header', patch=patch)
-        self.undoc_header = get_config('shell', CHARSET, 'undoc_header', patch=patch)
+        shell_attrs['intro'] = self.intro
+        shell_attrs['_prompt'] = get_config('shell', CHARSET, 'prompt', patch=patch)
+        self.prompt = shell_attrs['_prompt']
+        shell_attrs['ruler'] = get_config('shell', CHARSET, 'ruler', patch=patch)
+        self.ruler = shell_attrs['ruler']
+        shell_attrs['close_message'] = get_config('shell', CHARSET, 'close_message', patch=patch)
+        self.close_message = shell_attrs['close_message']
+        shell_attrs['doc_header'] = get_config('shell', CHARSET, 'doc_header', patch=patch)
+        self.doc_header = shell_attrs['doc_header']
+        shell_attrs['undoc_header'] = get_config('shell', CHARSET, 'undoc_header', patch=patch)
+        self.undoc_header = shell_attrs['undoc_header']
 
         if instance is None and self.__dict__.get('instance_keys', None) is None:
             ### create default instance and repository connectors
-            self.instance_keys = remove_ansi(get_config('meerschaum', 'instance', patch=patch))
-            ### self.instance is a stylized version of self.instance_keys
-            self.instance = str(self.instance_keys)
+            shell_attrs['instance_keys'] = remove_ansi(get_config('meerschaum', 'instance', patch=patch))
+            ### instance is a stylized version of instance_keys
+            shell_attrs['instance'] = str(shell_attrs['instance_keys'])
         else:
-            self.instance = instance
-            self.instance_keys = remove_ansi(str(instance))
-        if self.__dict__.get('repo_keys', None) is None:
-            self.repo_keys = get_config('meerschaum', 'default_repository', patch=patch)
+            shell_attrs['instance'] = instance
+            shell_attrs['instance_keys'] = remove_ansi(str(instance))
+        if shell_attrs.get('repo_keys', None) is None:
+            shell_attrs['repo_keys'] = get_config('meerschaum', 'default_repository', patch=patch)
         ### this will be updated later in update_prompt ONLY IF {username} is in the prompt
-        self.username = ''
+        shell_attrs['username'] = ''
 
         if ANSI:
             def apply_colors(attr, key):
@@ -325,48 +334,54 @@ class Shell(cmd.Cmd):
                 )
 
             for attr_key in get_config('shell', 'ansi'):
-                if attr_key not in self.__dict__:
+                if attr_key not in shell_attrs:
                     continue
-                self.__dict__[attr_key] = apply_colors(self.__dict__[attr_key], attr_key)
+                shell_attrs[attr_key] = apply_colors(shell_attrs[attr_key], attr_key)
+                self.__dict__[attr_key] = shell_attrs[attr_key]
 
         ### refresh actions
         _insert_shell_actions(_shell=self, keep_self=True)
 
         ### replace {instance} in prompt with stylized instance string
         self.update_prompt()
-        self._dict_backup = {k:v for k, v in self.__dict__.copy().items() if k != '_dict_backup'}
 
     def insert_actions(self):
         from meerschaum.actions import actions
 
     def update_prompt(self, instance: Optional[str] = None, username: Optional[str] = None):
         from meerschaum.utils.formatting import ANSI, colored
-        cmd.__builtins__['input'] = input_with_sigint(_old_input, self.session, shell=self)
-        prompt = self._prompt
+        from meerschaum._internal.entry import _shell, get_shell
+
+        cmd.__builtins__['input'] = input_with_sigint(
+            _old_input,
+            shell_attrs['session'],
+            shell = self,
+        )
+        prompt = shell_attrs['_prompt']
         mask = prompt
-        self._update_bottom_toolbar = True
+        shell_attrs['_update_bottom_toolbar'] = True
 
-        if '{instance}' in self._prompt:
+        if '{instance}' in shell_attrs['_prompt']:
             if instance is None:
-                instance = self.instance_keys
-            self.instance = instance
+                instance = shell_attrs['instance_keys']
+            shell_attrs['instance'] = instance
             if ANSI:
-                self.instance = colored(
-                    self.instance, **get_config(
+                shell_attrs['instance'] = colored(
+                    shell_attrs['instance'], **get_config(
                         'shell', 'ansi', 'instance', 'rich'
                     )
                 )
-            prompt = prompt.replace('{instance}', self.instance)
+            prompt = prompt.replace('{instance}', shell_attrs['instance'])
             mask = mask.replace('{instance}', ''.join(['\0' for c in '{instance}']))
 
-        if '{username}' in self._prompt:
+        if '{username}' in shell_attrs['_prompt']:
             if username is None:
                 from meerschaum.utils.misc import remove_ansi
                 from meerschaum.connectors.parse import parse_instance_keys
                 from meerschaum.connectors.sql import SQLConnector
                 try:
                     conn_attrs = parse_instance_keys(
-                        remove_ansi(self.instance_keys), construct=False
+                        remove_ansi(shell_attrs['instance_keys']), construct=False
                     )
                     if 'username' not in conn_attrs:
                         if 'uri' in conn_attrs:
@@ -379,14 +394,14 @@ class Shell(cmd.Cmd):
                     username = str(e)
                 if username is None:
                    username = '(no username)'
-            self.username = (
+            shell_attrs['username'] = (
                 username if not ANSI else
                 colored(username, **get_config('shell', 'ansi', 'username', 'rich'))
             )
-            prompt = prompt.replace('{username}', self.username)
+            prompt = prompt.replace('{username}', shell_attrs['username'])
             mask = mask.replace('{username}', ''.join(['\0' for c in '{username}']))
 
-        remainder_prompt = list(self._prompt)
+        remainder_prompt = list(shell_attrs['_prompt'])
         for i, c in enumerate(mask):
             if c != '\0':
                 _c = c
@@ -394,10 +409,11 @@ class Shell(cmd.Cmd):
                     _c = colored(_c, **get_config('shell', 'ansi', 'prompt', 'rich'))
                 remainder_prompt[i] = _c
         self.prompt = ''.join(remainder_prompt).replace(
-            '{username}', self.username
+            '{username}', shell_attrs['username']
         ).replace(
-            '{instance}', self.instance
+            '{instance}', shell_attrs['instance']
         )
+        shell_attrs['prompt'] = self.prompt
         ### flush stdout
         print("", end="", flush=True)
 
@@ -412,6 +428,9 @@ class Shell(cmd.Cmd):
         ### Preserve the working directory.
         old_cwd = os.getcwd()
 
+        from meerschaum._internal.entry import _shell, get_shell
+        self = get_shell(sysargs=shell_attrs['_sysargs'], debug=shell_attrs.get('debug', False))
+
         ### make a backup of line for later
         original_line = deepcopy(line)
 
@@ -427,7 +446,7 @@ class Shell(cmd.Cmd):
         ### if the user specifies, clear the screen before executing any commands
         if _clear_screen:
             from meerschaum.utils.formatting._shell import clear_screen
-            clear_screen(debug=self.debug)
+            clear_screen(debug=shell_attrs['debug'])
 
         ### return blank commands (spaces break argparse)
         if original_line is None or len(str(line).strip()) == 0:
@@ -456,11 +475,10 @@ class Shell(cmd.Cmd):
         args['shell'] = True
         args['line'] = line
 
-
         ### if debug is not set on the command line,
         ### default to shell setting
         if not args.get('debug', False):
-            args['debug'] = self.debug
+            args['debug'] = shell_attrs['debug']
 
         ### Make sure an action was provided.
         if not args.get('action', None):
@@ -479,17 +497,19 @@ class Shell(cmd.Cmd):
         from meerschaum.actions import get_main_action_name
         main_action_name = get_main_action_name(args['action'])
         if main_action_name is None:
-            if not hasattr(self, 'do_'+args['action'][0]):
+            if not hasattr(self, 'do_' + args['action'][0]):
                 args['action'].insert(0, 'sh')
                 main_action_name = 'sh'
+            else:
+                main_action_name = args['action'][0]
 
         ### if no instance is provided, use current shell default,
         ### but not for the 'api' command (to avoid recursion)
         if 'mrsm_instance' not in args and main_action_name != 'api':
-            args['mrsm_instance'] = str(self.instance_keys)
+            args['mrsm_instance'] = str(shell_attrs['instance_keys'])
 
         if 'repository' not in args and main_action_name != 'api':
-            args['repository'] = str(self.repo_keys)
+            args['repository'] = str(shell_attrs['repo_keys'])
 
         ### parse out empty strings
         if args['action'][0].strip("\"'") == '':
@@ -501,21 +521,25 @@ class Shell(cmd.Cmd):
             args['action'] = ['start', 'jobs'] + args['action']
             main_action_name = 'start'
 
-        positional_only = (main_action_name not in self._actions)
+        positional_only = (main_action_name not in shell_attrs['_actions'])
         if positional_only:
             return original_line
 
         from meerschaum._internal.entry import entry_with_args
 
         try:
-            success_tuple = entry_with_args(_actions=self._actions, **args)
+            success_tuple = entry_with_args(_actions=shell_attrs['_actions'], **args)
+            #  success_tuple = entry_with_args(**args)
         except Exception as e:
             success_tuple = False, str(e)
 
         from meerschaum.utils.formatting import print_tuple
         if isinstance(success_tuple, tuple):
             print_tuple(
-                success_tuple, skip_common=(not self.debug), upper_padding=1, lower_padding=0,
+                success_tuple,
+                skip_common = (not shell_attrs['debug']),
+                upper_padding = 1,
+                lower_padding = 0,
             )
 
         ### Restore the old working directory.
@@ -525,9 +549,9 @@ class Shell(cmd.Cmd):
         return ""
 
     def postcmd(self, stop : bool = False, line : str = ""):
-        _reload = self._reload
+        _reload = shell_attrs['_reload']
         if _reload:
-            self.load_config(self.instance)
+            self.load_config(shell_attrs['instance'])
         if stop:
             return True
 
@@ -555,15 +579,15 @@ class Shell(cmd.Cmd):
         except (IndexError, AttributeError):
             state = ''
         if state == '':
-            self.debug = not self.debug
+            shell_attrs['debug'] = not shell_attrs['debug']
         elif state.lower() in on_commands:
-            self.debug = True
+            shell_attrs['debug'] = True
         elif state.lower() in off_commands:
-            self.debug = False
+            shell_attrs['debug'] = False
         else:
             info(f"Unknown state '{state}'. Ignoring...")
 
-        info(f"Debug mode is {'on' if self.debug else 'off'}.")
+        info(f"Debug mode is {'on' if shell_attrs['debug'] else 'off'}.")
 
     def do_instance(
             self,
@@ -619,7 +643,7 @@ class Shell(cmd.Cmd):
         else:
             conn_keys = instance_keys
 
-        self.instance_keys = conn_keys
+        shell_attrs['instance_keys'] = conn_keys
 
         self.update_prompt(instance=conn_keys)
         info(f"Default instance for the current shell: {conn_keys}")
@@ -683,7 +707,7 @@ class Shell(cmd.Cmd):
         if conn is None or not conn:
             conn = get_connector('api', debug=debug)
 
-        self.repo_keys = str(conn)
+        shell_attrs['repo_keys'] = str(conn)
 
         info(f"Default repository for the current shell: {conn}")
         return True, "Success"
@@ -712,9 +736,9 @@ class Shell(cmd.Cmd):
         args = parse_line(line)
         if len(args['action']) == 0:
             del args['action']
-            self._actions['show'](['actions'], **args)
+            shell_attrs['_actions']['show'](['actions'], **args)
             return ""
-        if args['action'][0] not in self._actions:
+        if args['action'][0] not in shell_attrs['_actions']:
             try:
                 print(textwrap.dedent(getattr(self, f"do_{args['action'][0]}").__doc__))
             except Exception as e:
@@ -780,17 +804,21 @@ class Shell(cmd.Cmd):
         Patch builtin cmdloop with my own input (defined below).
         """
         import signal, os
-        cmd.__builtins__['input'] = input_with_sigint(_old_input, self.session, shell=self)
+        cmd.__builtins__['input'] = input_with_sigint(
+            _old_input,
+            shell_attrs['session'],
+            shell = self,
+        )
 
         ### if the user specifies, clear the screen before initializing the shell
         if _clear_screen:
             from meerschaum.utils.formatting._shell import clear_screen
-            clear_screen(debug=self.debug)
+            clear_screen(debug=shell_attrs['debug'])
 
         ### if sysargs are provided, skip printing the intro and execute instead
-        if self._sysargs:
-            self.intro = ""
-            self.precmd(' '.join(self._sysargs))
+        if shell_attrs['_sysargs']:
+            shell_attrs['intro'] = ""
+            self.precmd(' '.join(shell_attrs['_sysargs']))
 
     def postloop(self):
         print('\n' + self.close_message)
@@ -816,24 +844,24 @@ def input_with_sigint(_input, session, shell: Optional[Shell] = None):
         nonlocal last_connected
         if not get_config('shell', 'bottom_toolbar', 'enabled'):
             return None
-        if not shell._update_bottom_toolbar and platform.system() == 'Windows':
-            return shell._old_bottom_toolbar
+        if not shell_attrs['_update_bottom_toolbar'] and platform.system() == 'Windows':
+            return shell_attrs['_old_bottom_toolbar']
         size = os.get_terminal_size()
         num_cols, num_lines = size.columns, size.lines
 
         instance_colored = (
             colored(
-                shell.instance_keys, 'on ' + get_config(
+                shell_attrs['instance_keys'], 'on ' + get_config(
                     'shell', 'ansi', 'instance', 'rich', 'style'
                 )
-            ) if ANSI else colored(shell.instance_keys, 'on white')
+            ) if ANSI else colored(shell_attrs['instance_keys'], 'on white')
         )
         repo_colored = (
-            colored(shell.repo_keys, 'on ' + get_config('shell', 'ansi', 'repo', 'rich', 'style'))
-            if ANSI else colored(shell.repo_keys, 'on white')
+            colored(shell_attrs['repo_keys'], 'on ' + get_config('shell', 'ansi', 'repo', 'rich', 'style'))
+            if ANSI else colored(shell_attrs['repo_keys'], 'on white')
         )
         try:
-            typ, label = shell.instance_keys.split(':')
+            typ, label = shell_attrs['instance_keys'].split(':')
             connected = typ in connectors and label in connectors[typ]
         except Exception as e:
             connected = False
@@ -859,9 +887,9 @@ def input_with_sigint(_input, session, shell: Optional[Shell] = None):
         )
         buffer = (' ' * buffer_size) if buffer_size > 0 else '\n '
         text = left + buffer + right
-        shell._old_bottom_toolbar = prompt_toolkit_formatted_text.ANSI(text)
-        shell._update_bottom_toolbar = False
-        return shell._old_bottom_toolbar
+        shell_attrs['_old_bottom_toolbar'] = prompt_toolkit_formatted_text.ANSI(text)
+        shell_attrs['_update_bottom_toolbar'] = False
+        return shell_attrs['_old_bottom_toolbar']
 
     def _patched_prompt(*args):
         _args = []

meerschaum/_internal/shell/ShellCompleter.py

@@ -24,7 +24,9 @@ class ShellCompleter(Completer):
         """
         Bridge the built-in cmd completer with the `prompt_toolkit` completer system.
         """
-        shell_actions = [a[3:] for a in dir(get_shell()) if a.startswith('do_')]
+        from meerschaum._internal.shell.Shell import shell_attrs
+        shell = get_shell()
+        shell_actions = [a[3:] for a in dir(shell) if a.startswith('do_')]
         yielded = []
         ensure_readline()
         parts = document.text.split('-')
@@ -32,7 +34,6 @@ class ShellCompleter(Completer):
         part_0_subbed_spaces = parts[0].replace(' ', '_')
         parsed_text = part_0_subbed_spaces + '-'.join(parts[1:])
 
-        shell = get_shell()
 
         ### Index is the rank order (0 is closest match).
         ### Break when no results are returned.
@@ -50,11 +51,14 @@ class ShellCompleter(Completer):
             yielded.append(poss)
 
         args = parse_line(document.text)
-        action_function = get_action(args['action'], _actions=shell._actions)
+        action_function = get_action(args['action'], _actions=shell_attrs.get('_actions', None))
         if action_function is None:
             return
 
-        main_action_name = get_main_action_name(args['action'], _actions=shell._actions)
+        main_action_name = get_main_action_name(
+            args['action'],
+            _actions = shell_attrs.get('_actions', None)
+        )
 
         ### If we haven't yet hit space, don't suggest subactions.
         if not parsed_text.replace(

meerschaum/actions/reload.py

@@ -17,8 +17,5 @@ def reload(
     """
     Reload the running Meerschaum instance.
     """
-    from meerschaum.utils.packages import reload_package
-    from meerschaum.plugins import reload_plugins
-    reload_package('meerschaum')
-    reload_plugins(debug=debug)
-    return True, "Success"
+    from meerschaum.utils.packages import reload_meerschaum
+    return reload_meerschaum(debug=debug)

meerschaum/actions/show.py

@@ -7,7 +7,8 @@ This module contains functions for printing elements.
 """
 
 from __future__ import annotations
-from meerschaum.utils.typing import SuccessTuple, Union, Sequence, Any, Optional, List, Dict
+import meerschaum as mrsm
+from meerschaum.utils.typing import SuccessTuple, Union, Sequence, Any, Optional, List, Dict, Tuple
 
 def show(
         action: Optional[List[str]] = None,
@@ -738,34 +739,69 @@ def _show_environment(
 
 def _show_tags(
         tags: Optional[List[str]] = None,
+        workers: Optional[int] = None,
         nopretty: bool = False,
         **kwargs
     ) -> SuccessTuple:
     """
     Show the existing tags and their associated pipes.
     """
+    import json
     from collections import defaultdict
     import meerschaum as mrsm
-    from meerschaum.utils.formatting import pipe_repr
-    rich_tree = mrsm.attempt_import('rich.tree')
-    tree = rich_tree.Tree('Tags')
+    from meerschaum.utils.formatting import pipe_repr, UNICODE, ANSI
+    from meerschaum.utils.pool import get_pool
+    from meerschaum.config import get_config
+    rich_tree, rich_panel, rich_text, rich_console, rich_columns = (
+        mrsm.attempt_import('rich.tree', 'rich.panel', 'rich.text', 'rich.console', 'rich.columns')
+    )
+    panel = rich_panel.Panel.fit('Tags')
+    tree = rich_tree.Tree(panel)
     pipes = mrsm.get_pipes(as_list=True, **kwargs)
+    pool = get_pool(workers=workers)
+    tag_prefix = get_config('formatting', 'pipes', 'unicode', 'icons', 'tag') if UNICODE else ''
+    tag_style = get_config('formatting', 'pipes', 'ansi', 'styles', 'tags') if ANSI else None
 
     tags_pipes = defaultdict(lambda: [])
+    gather_pipe_tags = lambda pipe: (pipe, (pipe.tags or []))
+
+    pipes_tags = dict(pool.map(gather_pipe_tags, pipes))
 
-    for pipe in pipes:
-        for tag in pipe.tags:
+    for pipe, tags in pipes_tags.items():
+        for tag in tags:
             tags_pipes[tag].append(pipe)
 
+    columns = []
     sorted_tags = sorted([tag for tag in tags_pipes])
     for tag in sorted_tags:
         _pipes = tags_pipes[tag]
-        tag_branch = tree.add(tag)
-        for pipe in _pipes:
-            tag_branch.add(pipe_repr(pipe, as_rich_text=True))
-
-    mrsm.pprint(tree, nopretty=nopretty)
+        tag_text = (
+            rich_text.Text(tag_prefix)
+            + rich_text.Text(
+                tag,
+                style = tag_style,
+            )
+        )
+        pipes_texts = [
+            pipe_repr(pipe, as_rich_text=True)
+            for pipe in _pipes
+        ]
+        tag_group = rich_console.Group(*pipes_texts)
+        tag_panel = rich_panel.Panel(tag_group, title=tag_text, title_align='left')
+        columns.append(tag_panel)
 
+    if not nopretty:
+        mrsm.pprint(
+            rich_columns.Columns(
+                columns,
+                equal = True,
+            ),
+        )
+    else:
+        for tag, _pipes in tags_pipes.items():
+            print(tag)
+            for pipe in _pipes:
+                print(json.dumps(pipe.meta))
 
     return True, "Success"
 

meerschaum/config/_edit.py

@@ -6,9 +6,9 @@
 Functions for editing the configuration file
 """
 
-#  from meerschaum.utils.debug import dprint
 from __future__ import annotations
 import sys
+import pathlib
 from meerschaum.utils.typing import Optional, Any, SuccessTuple, Mapping, Dict, List, Union
 
 def edit_config(
@@ -21,7 +21,7 @@ def edit_config(
     from meerschaum.config import get_config, config
     from meerschaum.config._read_config import get_keyfile_path
     from meerschaum.config._paths import CONFIG_DIR_PATH
-    from meerschaum.utils.packages import reload_package
+    from meerschaum.utils.packages import reload_meerschaum
     from meerschaum.utils.misc import edit_file
     from meerschaum.utils.debug import dprint
 
@@ -35,10 +35,7 @@ def edit_config(
         get_config(k, write_missing=True, warn=False)
         edit_file(get_keyfile_path(k, create_new=True))
 
-    if debug:
-        dprint("Reloading configuration...")
-    reload_package('meerschaum', debug=debug, **kw)
-
+    reload_meerschaum(debug=debug)
     return (True, "Success")
 
 
@@ -78,7 +75,7 @@ def write_config(
     from meerschaum.utils.debug import dprint
     from meerschaum.utils.yaml import yaml
     from meerschaum.utils.misc import filter_keywords
-    import json, os, pathlib
+    import json, os
     if config_dict is None:
         from meerschaum.config import _config
         cf = _config()
@@ -162,7 +159,6 @@ def general_write_yaml_config(
     """
 
     from meerschaum.utils.debug import dprint
-    from pathlib import Path
 
     if files is None:
         files = {}
@@ -172,7 +168,7 @@ def general_write_yaml_config(
         header = None
         if isinstance(value, tuple):
             config, header = value
-        path = Path(fp)
+        path = pathlib.Path(fp)
         path.parent.mkdir(parents=True, exist_ok=True)
         path.touch(exist_ok=True)
         with open(path, 'w+') as f:
@@ -193,32 +189,12 @@ def general_write_yaml_config(
     return True
 
 def general_edit_config(
-        action : Optional[List[str]] = None,
-        files : Optional[Dict[str, Union[str, pathlib.Path]]] = None,
-        default : str = None,
-        debug : bool = False
+        action: Optional[List[str]] = None,
+        files: Optional[Dict[str, Union[str, pathlib.Path]]] = None,
+        default: Optional[str] = None,
+        debug: bool = False
     ):
-    """Edit any config files
-
-    Parameters
-    ----------
-    action : Optional[List[str]] :
-         (Default value = None)
-    files : Optional[Dict[str :
-        
-    Union[str :
-        
-    pathlib.Path]]] :
-         (Default value = None)
-    default : str :
-         (Default value = None)
-    debug : bool :
-         (Default value = False)
-
-    Returns
-    -------
-
-    """
+    """Prompt the user to edit any config files."""
     if default is None:
         raise Exception("Provide a default choice for which file to edit")
     import os

meerschaum/config/_formatting.py

@@ -35,6 +35,7 @@ default_formatting_config = {
         'running'          : '🟢',
         'paused'           : '🟡',
         'stopped'          : '🔴',
+        'tag'              : '🏷️',
     },
     'pipes'                : {
         'unicode'          : {
@@ -43,6 +44,7 @@ default_formatting_config = {
                 'metric'   : 'MRSM{formatting:emoji:metric} ',
                 'location' : 'MRSM{formatting:emoji:location} ',
                 'key'      : 'MRSM{formatting:emoji:key} ',
+                'tag'      : 'MRSM{formatting:emoji:tag} ',
             },
         },
         'ascii'            : {
@@ -51,6 +53,7 @@ default_formatting_config = {
                 'metric'   : '',
                 'location' : '',
                 'key'      : '',
+                'tag'      : '',
             },
         },
         'ansi'             : {
@@ -61,6 +64,7 @@ default_formatting_config = {
                 'key'      : '',
                 'guide'    : 'dim',
                 'none'     : 'black on magenta',
+                'tags'     : 'bold yellow underline',
             },
         },
         '__repr__'         : {

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.1.3.dev2"
+__version__ = "2.1.3.dev3"

meerschaum/config/static/__init__.py

@@ -56,6 +56,8 @@ STATIC_CONFIG: Dict[str, Any] = {
         'dep_group': 'MRSM_DEP_GROUP',
         'home': 'MRSM_HOME',
         'src': 'MRSM_SRC',
+        'uid': 'MRSM_UID',
+        'gid': 'MRSM_GID',
         'noask': 'MRSM_NOASK',
         'id': 'MRSM_SERVER_ID',
         'uri_regex': r'MRSM_([a-zA-Z0-9]*)_(\d*[a-zA-Z][a-zA-Z0-9-_+]*$)',

meerschaum/plugins/_Plugin.py

@@ -283,8 +283,8 @@ class Plugin:
         import tarfile
         import re
         import ast
-        from meerschaum.plugins import reload_plugins, sync_plugins_symlinks
-        from meerschaum.utils.packages import attempt_import, determine_version, reload_package
+        from meerschaum.plugins import sync_plugins_symlinks
+        from meerschaum.utils.packages import attempt_import, determine_version, reload_meerschaum
         from meerschaum.utils.venv import init_venv
         from meerschaum.utils.misc import safely_extract_tar
         old_cwd = os.getcwd()
@@ -415,8 +415,7 @@ class Plugin:
         if '_module' in self.__dict__:
             del self.__dict__['_module']
         init_venv(venv=self.name, force=True, debug=debug)
-        reload_package('meerschaum')
-        reload_plugins([self.name], debug=debug)
+        reload_meerschaum(debug=debug)
 
         ### if we've already failed, return here
         if not success or abort:
@@ -493,8 +492,8 @@ class Plugin:
         """
         Remove a plugin, its virtual environment, and archive file.
         """
-        from meerschaum.utils.packages import reload_package
-        from meerschaum.plugins import reload_plugins, sync_plugins_symlinks
+        from meerschaum.utils.packages import reload_meerschaum
+        from meerschaum.plugins import sync_plugins_symlinks
         from meerschaum.utils.warnings import warn, info
         warnings_thrown_count: int = 0
         max_warnings: int = 3
@@ -529,8 +528,7 @@ class Plugin:
         success = warnings_thrown_count < max_warnings
         sync_plugins_symlinks(debug=debug)
         self.deactivate_venv(force=True, debug=debug)
-        reload_package('meerschaum')
-        reload_plugins(debug=debug)
+        reload_meerschaum(debug=debug)
         return success, (
             f"Successfully uninstalled plugin '{self}'." if success
             else f"Failed to uninstall plugin '{self}'."

meerschaum/utils/packages/__init__.py

@@ -9,7 +9,7 @@ Functions for managing packages and virtual environments reside here.
 from __future__ import annotations
 
 import importlib.util, os, pathlib
-from meerschaum.utils.typing import Any, List, SuccessTuple, Optional, Union, Tuple, Dict
+from meerschaum.utils.typing import Any, List, SuccessTuple, Optional, Union, Tuple, Dict, Iterable
 from meerschaum.utils.threading import Lock, RLock
 from meerschaum.utils.packages._packages import packages, all_packages, get_install_names
 from meerschaum.utils.venv import (
@@ -1494,16 +1494,18 @@ def import_children(
     return members
 
 
+_reload_module_cache = {}
 def reload_package(
         package: str,
+        skip_submodules: Optional[List[str]] = None,
         lazy: bool = False,
         debug: bool = False,
         **kw: Any
-    ) -> 'ModuleType':
+    ):
     """
     Recursively load a package's subpackages, even if they were not previously loaded.
     """
-    import pydoc
+    import sys
     if isinstance(package, str):
         package_name = package
     else:
@@ -1511,7 +1513,44 @@ def reload_package(
             package_name = package.__name__
         except Exception as e:
             package_name = str(package)
-    return pydoc.safeimport(package_name, forceload=1)
+
+    skip_submodules = skip_submodules or []
+    if 'meerschaum.utils.packages' not in skip_submodules:
+        skip_submodules.append('meerschaum.utils.packages')
+    def safeimport():
+        subs = [
+            m for m in sys.modules
+            if m.startswith(package_name + '.')
+        ]
+        subs_to_skip = []
+        for skip_mod in skip_submodules:
+            for mod in subs:
+                if mod.startswith(skip_mod):
+                    subs_to_skip.append(mod)
+                    continue
+
+        subs = [m for m in subs if m not in subs_to_skip]
+        for module_name in subs:
+            _reload_module_cache[module_name] = sys.modules.pop(module_name, None)
+        if not subs_to_skip:
+            _reload_module_cache[package_name] = sys.modules.pop(package_name, None)
+
+        return _import_module(package_name)
+
+    return safeimport()
+
+
+def reload_meerschaum(debug: bool = False) -> SuccessTuple:
+    """
+    Reload the currently loaded Meercshaum modules, refreshing plugins and shell configuration.
+    """
+    reload_package('meerschaum', skip_submodules=['meerschaum._internal.shell'])
+
+    from meerschaum.plugins import reload_plugins
+    from meerschaum._internal.shell.Shell import _insert_shell_actions
+    reload_plugins(debug=debug)
+    _insert_shell_actions()
+    return True, "Success"
 
 
 def is_installed(

meerschaum/utils/venv/__init__.py

@@ -362,7 +362,24 @@ def init_venv(
         return True
 
     import sys, platform, os, pathlib, shutil
+    from meerschaum.config.static import STATIC_CONFIG
     from meerschaum.config._paths import VIRTENV_RESOURCES_PATH
+    venv_path = VIRTENV_RESOURCES_PATH / venv
+    docker_home_venv_path = pathlib.Path('/home/meerschaum/venvs/mrsm')
+
+    runtime_env_var = STATIC_CONFIG['environment']['runtime']
+    if (
+        not force
+        and venv == 'mrsm'
+        and os.environ.get(runtime_env_var, None) == 'docker'
+        and docker_home_venv_path.exists()
+    ):
+        shutil.move(docker_home_venv_path, venv_path)
+        if verify:
+            verify_venv(venv, debug=debug)
+            verified_venvs.add(venv)
+        return True
+
     from meerschaum.utils.packages import run_python_package, attempt_import
     global tried_virtualenv
     try:
@@ -372,7 +389,6 @@ def init_venv(
         _venv = None
         virtualenv = None
     
-    venv_path = VIRTENV_RESOURCES_PATH / venv
 
     _venv_success = False
     if _venv is not None:

{meerschaum-2.1.3.dev2.dist-info → meerschaum-2.1.3.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.1.3.dev2
+Version: 2.1.3.dev3
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares

{meerschaum-2.1.3.dev2.dist-info → meerschaum-2.1.3.dev3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 meerschaum/__init__.py,sha256=mw_PhxT7155SW8d_S51T4-WTibL5g205CwMa3qX8qyA,1487
 meerschaum/__main__.py,sha256=6JMfERA83SyJH2_UHPyrl2v4rjoyXqGh6h4x3UNe3xU,2774
 meerschaum/_internal/__init__.py,sha256=ilC7utfKtin7GAvuN34fKyUQYfPyqH0Mm3MJF5iyEf4,169
-meerschaum/_internal/entry.py,sha256=Np5gAs8fxiz9QfPTL79sZjZUJIxVYTRi5BV9dXvJ9Dc,4775
+meerschaum/_internal/entry.py,sha256=_76FVDQGzZ_AU37XfC42ZVIDx4KHx4Xf5-lEQR2nmwg,4820
 meerschaum/_internal/arguments/__init__.py,sha256=HFciFQgo2ZOT19Mo6CpLhPYlpLYh2sNn1C9Lo7NMADc,519
 meerschaum/_internal/arguments/_parse_arguments.py,sha256=dNVDBvXYNgEw-TrlZJ9A6VPlG696EpQcQm6FOAhseqw,10249
 meerschaum/_internal/arguments/_parser.py,sha256=siHYO_li3h206iYik786KFT_ZnaHC052zaZK7FFESjQ,13548
@@ -12,8 +12,8 @@ meerschaum/_internal/gui/app/__init__.py,sha256=rKUa8hHk6Fai-PDF61tQcpT1myxKcfmv
 meerschaum/_internal/gui/app/_windows.py,sha256=-VHdjTzA3V596fVqnbmTxemONSp_80-sTNJ0CTB8FwU,2632
 meerschaum/_internal/gui/app/actions.py,sha256=rx37qXf3uoa7Ou0n1cISqNFZNL0nr4wO7vSUmWO8f2E,935
 meerschaum/_internal/gui/app/pipes.py,sha256=4nAQ0rrHb_2bNgDF0Ru2YlbPaCDDzAl5beOGU4Af-4A,1596
-meerschaum/_internal/shell/Shell.py,sha256=UonUxR4rQyBuS1-wDe5-EoyCZmLZuGpFJfWPsLgxg0Q,31489
-meerschaum/_internal/shell/ShellCompleter.py,sha256=8grr7vRvUVug8GY8MDZM3uinQGWZcdH3apxZSDzcGZ0,2981
+meerschaum/_internal/shell/Shell.py,sha256=34lDd4FVTyvj17L4WdcSWwN60VXu0NpiVzY45IGTWq4,33102
+meerschaum/_internal/shell/ShellCompleter.py,sha256=bbG-mExNXO4pltWBOXdbMp8P2wLgy8_BgipIr5aGp5s,3114
 meerschaum/_internal/shell/ValidAutoSuggest.py,sha256=bARjOWMidz0dvMelLUe6yRPto5l3gcEHYHqFDjoh22I,1280
 meerschaum/_internal/shell/__init__.py,sha256=vXQoQPEVlYiUYai1b5AwQAlTnja6A2cSABnqXhzlS7I,281
 meerschaum/_internal/shell/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,10 +35,10 @@ meerschaum/actions/os.py,sha256=dtoppoBhLzW3rLNF0SFovEfNxA4WJWt_9WrOGlS5KbA,2251
 meerschaum/actions/pause.py,sha256=kDK0UMm90TuohFEG5Gugl3PEbuqGua-ghidqvgYShoc,3909
 meerschaum/actions/python.py,sha256=eXSpAli8ARo9k2NeZi11TwiyA6T5leMSDQXKS6dgRkM,2395
 meerschaum/actions/register.py,sha256=d99u0Yr395f3g23oWH7VMOqAlWQLZHVaS6woZqrNViU,11214
-meerschaum/actions/reload.py,sha256=8DHOEZn98LT3HJTQehkjHMEAq_Lz4xAHweUn3iZdvMQ,605
+meerschaum/actions/reload.py,sha256=gMXeFBGVfyQ7uhKhYf6bLaDMD0fLPcA9BrLBSiuvWIc,508
 meerschaum/actions/setup.py,sha256=KkAGWcgwzl_L6A19fTmTX1KtBjW2FwD8QenLjPy0mQQ,3205
 meerschaum/actions/sh.py,sha256=fLfTJaacKu4sjLTRqEzzYlT2WbbdZBEczsKb6F-qAek,2026
-meerschaum/actions/show.py,sha256=tD0eULofGfgcjrQlJ-KiqZ6lsKxzNARSpqICWNfMhtA,24527
+meerschaum/actions/show.py,sha256=pmH2G3CA-10YM_MLLaHdpXOMmZo112rE17hB2yEEj2Y,25865
 meerschaum/actions/sql.py,sha256=wYofwk1vGO96U2ncigGEfMtYMZeprz2FR1PRRZhkAPI,4311
 meerschaum/actions/stack.py,sha256=WMRMebyYwZGNlbnj6Ja09qvCSDNteFJOTa8_joHlnVo,5886
 meerschaum/actions/start.py,sha256=mNFWqxc_o9moavvDQWE4YoZF6b-SW2nKyw5MtwIj-90,18384
@@ -123,9 +123,9 @@ meerschaum/api/routes/_webterm.py,sha256=7eilgDXckpEc2LyeNmJS5YO6HxlyMkwPnAMWd7e
 meerschaum/api/tables/__init__.py,sha256=e2aNC0CdlWICTUMx1i9RauF8Pm426J0RZJbsJWv4SWo,482
 meerschaum/config/__init__.py,sha256=01hZ4Z8jGs4LbcIwNTeVzSvHD-Y0nAgiewRgngVUYb4,11517
 meerschaum/config/_default.py,sha256=SJqekCM-90yQQHduF43aNvP6EqvB_fkZqozJSeJ7Wz8,5184
-meerschaum/config/_edit.py,sha256=z7gBr5YGYkUbwkUsZwd9xncmxttkdxcS9cVbgLo2zCA,8679
+meerschaum/config/_edit.py,sha256=CE8gumBiOtnZZdTATCLAZgUnhL04yJdReaNCrv1yuJc,8218
 meerschaum/config/_environment.py,sha256=Vv4DLDfc2vKLbCLsMvkQDj77K4kEvHKEBmUBo-wCrgo,4419
-meerschaum/config/_formatting.py,sha256=5HVYrRfhZlhbQt_ks4Mg1ttZX0T6awO2NwbREHYlYMI,6451
+meerschaum/config/_formatting.py,sha256=BxpWY0vGM8strR2v17cdDqFDrpr6NQ-0cH4uDFPOCWE,6638
 meerschaum/config/_jobs.py,sha256=2VGbg885rgz8jsIF52Z_Q76kdmAXNKDk7p2dnahmsnc,1073
 meerschaum/config/_patch.py,sha256=21N30q1ANmWMDQ-2RUjpMx7KafWfPQ3lKx9rrMqg1s4,1526
 meerschaum/config/_paths.py,sha256=ORzpEpYE5OM06H6Hw_nh51R8fkk45MyGPI7mDd1QzqI,7983
@@ -133,14 +133,14 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=WFZKIXZMDe_ca0ES7ivgM_mnwShvFxLdoeisT_X5-h0,14720
 meerschaum/config/_shell.py,sha256=k6PH0BEr2imhgURLYlR5p6s5gXfYpWoyZSV29U-SsXk,3589
 meerschaum/config/_sync.py,sha256=Q-sz5YcjL3CJS2Dyw4rVRQsz9th9GWa9o5F9D0Jrmn8,4120
-meerschaum/config/_version.py,sha256=EHQL7tGckWgXyQLhAbfj7rG1WaSX0gEAZ7-bYVDUJGM,76
+meerschaum/config/_version.py,sha256=EuhT63apwdqJ99P_Z2S28D5qOFqBNhYmqcl2TE_MXX0,76
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=4a_up1oxkitwgIylWWk0vA4XkGhEpWazUaENOPEdYQI,9034
 meerschaum/config/stack/grafana/__init__.py,sha256=wzuoch_AK49lcn7lH2qTSJ_PPbSagF4lcweeipz_XiE,2010
 meerschaum/config/stack/mosquitto/__init__.py,sha256=-OwOjq8KiBoSH_pmgCAAF3Dp3CRD4KgAEdimZSadROs,186
 meerschaum/config/stack/mosquitto/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meerschaum/config/static/__init__.py,sha256=UUaQsEYzd8hZaeAYmCu5YNyFTty9AmKddaO6HMuGRMQ,4307
+meerschaum/config/static/__init__.py,sha256=oDxx1wVGowW-AQsbVGmr4R4ZvCF-f1pdAalX5x5OpJE,4361
 meerschaum/connectors/Connector.py,sha256=cJKinmk7eWZwCBvtX4H9r66macTZOY1qjxR7JUEmDmg,6381
 meerschaum/connectors/__init__.py,sha256=0uAfGRyLhUI19p161wytmzAurx3znhh4I9O9PyZ4w_E,12023
 meerschaum/connectors/parse.py,sha256=gidA2jvOLTvEeL5hM9JjcUwkMRBadUhd4IfA5Jy1tgg,4044
@@ -191,7 +191,7 @@ meerschaum/core/Pipe/_verify.py,sha256=KSnthUzImRLjt9fxyBaLvArqDuOLRpKBfk0tnseJC
 meerschaum/core/Plugin/__init__.py,sha256=UXg64EvJPgI1PCxkY_KM02-ZmBm4FZpLPIQR_uSJJDc,137
 meerschaum/core/User/_User.py,sha256=waVdpH4SFZSXNYBgX5KFQ8csbCSxRLI5T2efAzVONks,2448
 meerschaum/core/User/__init__.py,sha256=EiL0rYdtNeu2HqXFLurJcyomjyw3UTFdAR8rgb_vlbU,161
-meerschaum/plugins/_Plugin.py,sha256=Vzu5I01sjM9r_pbI13qYZXw2BxByi0ZPbWXy2O0rdgk,33813
+meerschaum/plugins/_Plugin.py,sha256=f0RDPazwzYSTZmD21rxwF48abUeVyFWKggBC9cWR7sw,33706
 meerschaum/plugins/__init__.py,sha256=pVRgbBk1UMlqLrM5p1s7_x_mN70epdDBZOa4vrt6C6w,20760
 meerschaum/utils/__init__.py,sha256=Hf-9PtssyubKGBFMjB3R3_N7TVjy24wfm4SLqO4r4_A,552
 meerschaum/utils/dataframe.py,sha256=OHf2IQOjA77pvpMorHWd3lICMcvkaZsvPE2PZjFakPw,26427
@@ -220,16 +220,16 @@ meerschaum/utils/formatting/_jobs.py,sha256=s1lVcdMkzNj5Bqw-GsUhcguUFtahi5nQ-kg1
 meerschaum/utils/formatting/_pipes.py,sha256=vixqKIUYNC7yDtU-MoeSXnHug9IGkK1N2yqujxvJ-i0,18414
 meerschaum/utils/formatting/_pprint.py,sha256=tgrT3FyGyu5CWJYysqK3kX1xdZYorlbOk9fcU_vt9Qg,3096
 meerschaum/utils/formatting/_shell.py,sha256=ox75O7VHDAiwzSvdMSJZhXLadvAqYJVeihU6WeZ2Ogc,3677
-meerschaum/utils/packages/__init__.py,sha256=n3S5pFABtIjYNv2Ts78mcuaN5eE7r1vzPiOqpRQvi4w,55011
+meerschaum/utils/packages/__init__.py,sha256=86mVkFEZP4aCu0EdTA9shBPR0DUPxQvu9c_yIDw4Hh8,56361
 meerschaum/utils/packages/_packages.py,sha256=KmuQpMNhYb698HlWgG72nFyKQdcAwaDAQCJO3ECwAMc,8024
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=sBnlmxHdAh2bx8btfVoD79-H9-cYsv5lP02IIXkyECs,3553
-meerschaum/utils/venv/__init__.py,sha256=IZ-4XW-coDJlABT9Fh-c-vxJwvg13lQrCzkAcnojI1U,22588
-meerschaum-2.1.3.dev2.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.1.3.dev2.dist-info/METADATA,sha256=RaXYdppqzQpfm2vNUl1TzZwkyQ_AuWD7HS0hbjTViZ4,24120
-meerschaum-2.1.3.dev2.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.1.3.dev2.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-meerschaum-2.1.3.dev2.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.1.3.dev2.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.1.3.dev2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.1.3.dev2.dist-info/RECORD,,
+meerschaum/utils/venv/__init__.py,sha256=Ln-EguP8g-Jc8OrtDj0orRCJ_VPj2izFkYbV4arIbhE,23118
+meerschaum-2.1.3.dev3.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.1.3.dev3.dist-info/METADATA,sha256=m9L4ibFqN4-zStsrcCpndEWcsxTPkz7i7wCFWYnYHyE,24120
+meerschaum-2.1.3.dev3.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.1.3.dev3.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+meerschaum-2.1.3.dev3.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.1.3.dev3.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.1.3.dev3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.1.3.dev3.dist-info/RECORD,,