meerschaum 2.2.1__py3-none-any.whl → 2.2.2rc2__py3-none-any.whl

meerschaum/_internal/shell/Shell.py

@@ -203,6 +203,29 @@ def _check_complete_keys(line: str) -> Optional[List[str]]:
     return None
 
 
+def get_shell_intro(with_color: bool = True) -> str:
+    """
+    Return the introduction message string.
+    """
+    from meerschaum.utils.formatting import CHARSET, ANSI, colored
+    intro = get_config('shell', CHARSET, 'intro', patch=patch)
+    intro += '\n' + ''.join(
+        [' '
+            for i in range(
+                string_width(intro) - len('v' + version)
+            )
+        ]
+    ) + 'v' + version
+
+    if not with_color or not ANSI:
+        return intro
+
+    return colored(
+        intro,
+        **get_config('shell', 'ansi', 'intro', 'rich')
+    )
+
+
 class Shell(cmd.Cmd):
     def __init__(
             self,
@@ -277,25 +300,20 @@ class Shell(cmd.Cmd):
         except Exception as e:
             pass
 
-
     def load_config(self, instance: Optional[str] = None):
         """
         Set attributes from the shell configuration.
         """
         from meerschaum.utils.misc import remove_ansi
-        from meerschaum.utils.formatting import CHARSET, ANSI, UNICODE, colored
+        from meerschaum.utils.formatting import CHARSET, ANSI, colored
         
         if shell_attrs.get('intro', None) != '':
-            self.intro = get_config('shell', CHARSET, 'intro', patch=patch)
-            self.intro += '\n' + ''.join(
-                [' '
-                    for i in range(
-                        string_width(self.intro) - len('v' + version)
-                    )
-                ]
-            ) + 'v' + version
-        else:
-            self.intro = ""
+            self.intro = (
+                get_shell_intro(with_color=False)
+                if shell_attrs.get('intro', None) != ''
+                else ""
+            )
+
         shell_attrs['intro'] = self.intro
         shell_attrs['_prompt'] = get_config('shell', CHARSET, 'prompt', patch=patch)
         self.prompt = shell_attrs['_prompt']
@@ -822,7 +840,7 @@ def input_with_sigint(_input, session, shell: Optional[Shell] = None):
     """
     Replace built-in `input()` with prompt_toolkit.prompt.
     """
-    from meerschaum.utils.formatting import CHARSET, ANSI, UNICODE, colored
+    from meerschaum.utils.formatting import CHARSET, ANSI, colored
     from meerschaum.connectors import is_connected, connectors
     from meerschaum.utils.misc import remove_ansi
     from meerschaum.config import get_config

meerschaum/_internal/term/__init__.py

@@ -16,7 +16,7 @@ from meerschaum._internal.term.TermPageHandler import TermPageHandler
 from meerschaum.config._paths import API_TEMPLATES_PATH, API_STATIC_PATH
 
 tornado, tornado_ioloop, terminado = attempt_import(
-    'tornado', 'tornado.ioloop', 'terminado', lazy=False, venv=None,
+    'tornado', 'tornado.ioloop', 'terminado', lazy=False,
 )
 
 def get_webterm_app_and_manager() -> Tuple[

meerschaum/_internal/term/tools.py

@@ -17,7 +17,7 @@ def is_webterm_running(host: str, port: int, protocol: str = 'http') -> int:
     requests = attempt_import('requests')
     url = f'{protocol}://{host}:{port}'
     try:
-        r = requests.get(url)
+        r = requests.get(url, timeout=3)
     except Exception as e:
         return False
     if not r:

meerschaum/actions/api.py

@@ -169,7 +169,7 @@ def _api_start(
     ### `check_update` must be False, because otherwise Uvicorn's hidden imports will break things.
     dotenv = attempt_import('dotenv', lazy=False)
     uvicorn, gunicorn = attempt_import(
-        'uvicorn', 'gunicorn', venv=None, lazy=False, check_update=False,
+        'uvicorn', 'gunicorn', lazy=False, check_update=False,
     )
 
     uvicorn_config_path = API_UVICORN_RESOURCES_PATH / SERVER_ID / 'config.json'
@@ -306,15 +306,50 @@ def _api_start(
 
     def _run_uvicorn():
         try:
-            uvicorn.run(
-                **filter_keywords(
-                    uvicorn.run,
-                    **{
-                        k: v
-                        for k, v in uvicorn_config.items()
-                        if k not in custom_keys
-                    }
-                )
+            uvicorn_flags = [
+                '--host', host,
+                '--port', str(port),
+                (
+                    '--proxy-headers'
+                    if uvicorn_config.get('proxy_headers')
+                    else '--no-proxy-headers'
+                ),
+                (
+                    '--use-colors'
+                    if uvicorn_config.get('use_colors')
+                    else '--no-use-colors'
+                ),
+                '--env-file', uvicorn_config['env_file'],
+            ]
+            if uvicorn_reload := uvicorn_config.get('reload'):
+                uvicorn_flags.append('--reload')
+            if (
+                uvicorn_reload
+                and (reload_dirs := uvicorn_config.get('reload_dirs'))
+            ):
+                if not isinstance(reload_dirs, list):
+                    reload_dirs = [reload_dirs]
+                for reload_dir in reload_dirs:
+                    uvicorn_flags += ['--reload-dir', reload_dir]
+            if (
+                uvicorn_reload
+                and (reload_excludes := uvicorn_config.get('reload_excludes'))
+            ):
+                if not isinstance(reload_excludes, list):
+                    reload_excludes = [reload_excludes]
+                for reload_exclude in reload_excludes:
+                    uvicorn_flags += ['--reload-exclude', reload_exclude]
+            if (uvicorn_workers := uvicorn_config.get('workers')) is not None:
+                uvicorn_flags += ['--workers', str(uvicorn_workers)]
+
+            uvicorn_args = uvicorn_flags + ['meerschaum.api:app']
+            proc = run_python_package(
+                'uvicorn',
+                uvicorn_args,
+                venv = 'mrsm',
+                as_proc = True,
+                foreground = True,
+                debug = debug,
             )
         except KeyboardInterrupt:
             pass
@@ -350,7 +385,7 @@ def _api_start(
                     )
                     for k, v in env_dict.items()
                 },
-                venv = None,
+                venv = 'mrsm',
                 debug = debug,
             )
         except KeyboardInterrupt:

meerschaum/actions/python.py

@@ -10,36 +10,37 @@ from meerschaum.utils.typing import SuccessTuple, Any, List, Optional
 
 def python(
         action: Optional[List[str]] = None,
+        venv: Optional[str] = 'mrsm',
+        sub_args: Optional[List[str]] = None,
         debug: bool = False,
         **kw: Any
     ) -> SuccessTuple:
     """
-    Launch a Python interpreter with Meerschaum imported. Commands are optional.
-    Note that quotes must be escaped and commands must be separated by semicolons
+    Launch a virtual environment's Python interpreter with Meerschaum imported.
+    You may pass flags to the Python binary by surrounding each flag with `[]`.
     
     Usage:
         `python {commands}`
     
-    Example:
-        `python print(\\'Hello, World!\\'); pipes = mrsm.get_pipes()`
-    
-        ```
-        Hello, World!
-
-        >>> import meerschaum as mrsm
-        >>> print('Hello, World!')
-        >>> pipes = mrsm.get_pipes()
-        ```
+    Examples:
+        mrsm python
+        mrsm python --venv noaa
+        mrsm python [-i] [-c 'print("hi")']
     """
-    import sys, subprocess
+    import sys, subprocess, os
     from meerschaum.utils.debug import dprint
     from meerschaum.utils.warnings import warn, error
     from meerschaum.utils.process import run_process
+    from meerschaum.utils.venv import venv_executable
     from meerschaum.config import __version__ as _version
+    from meerschaum.config.paths import VIRTENV_RESOURCES_PATH
 
     if action is None:
         action = []
 
+    if venv == 'None':
+        venv = None
+
     joined_actions = ['import meerschaum as mrsm']
     line = ""
     for i, a in enumerate(action):
@@ -51,7 +52,6 @@ def python(
             line = ""
 
     ### ensure meerschaum is imported
-    #  joined_actions = ['import meerschaum as mrsm;'] + joined_actions
     if debug:
         dprint(joined_actions)
 
@@ -75,8 +75,24 @@ def python(
 
     if debug:
         dprint(f"command:\n{command}")
+
+    env_dict = os.environ.copy()
+    venv_path = (VIRTENV_RESOURCES_PATH / venv) if venv is not None else None
+    if venv_path is not None:
+        env_dict.update({'VIRTUAL_ENV': venv_path.as_posix()})
+
+    args_to_run = (
+        [venv_executable(venv), '-i', '-c', command]
+        if not sub_args
+        else [venv_executable(venv)] + sub_args
+    )
+
     try:
-        return_code = run_process([sys.executable, '-i', '-c', command], foreground=True)
+        return_code = run_process(
+            args_to_run,
+            foreground = True,
+            env = env_dict,
+        )
     except KeyboardInterrupt:
         return_code = 1
     return return_code == 0, (

meerschaum/actions/start.py

@@ -333,8 +333,7 @@ def _start_gui(
     from meerschaum.connectors.parse import parse_instance_keys
     from meerschaum._internal.term.tools import is_webterm_running
     import platform
-    webview = attempt_import('webview')
-    requests = attempt_import('requests')
+    webview, requests = attempt_import('webview', 'requests')
     import json
     import time
 
@@ -365,7 +364,7 @@ def _start_gui(
     base_url = 'http://' + api_kw['host'] + ':' + str(api_kw['port'])
 
     process = venv_exec(
-        start_tornado_code, as_proc=True, venv=None, debug=debug, capture_output=(not debug)
+        start_tornado_code, as_proc=True, debug=debug, capture_output=(not debug)
     )
     timeout = 10
     start = time.perf_counter()
@@ -446,7 +445,6 @@ def _start_webterm(
                 + "    Include `-f` to start another server on a new port\n"
                 + "    or specify a different port with `-p`."
             )
-
     if not nopretty:
         info(f"Starting the webterm at http://{host}:{port} ...\n    Press CTRL+C to quit.")
     tornado_app.listen(port, host)

meerschaum/actions/upgrade.py

@@ -140,7 +140,7 @@ def _upgrade_packages(
     if venv is NoVenv:
         venv = 'mrsm'
     if len(action) == 0:
-        group = 'full'
+        group = 'api'
     else:
         group = action[0]
 

meerschaum/api/__init__.py

@@ -31,6 +31,7 @@ CHECK_UPDATE = os.environ.get(STATIC_CONFIG['environment']['runtime'], None) !=
 
 endpoints = STATIC_CONFIG['api']['endpoints']
 
+uv = attempt_import('uv', lazy=False, check_update=CHECK_UPDATE)
 (
     fastapi,
     aiofiles,

meerschaum/api/dash/components.py

@@ -12,7 +12,7 @@ from meerschaum.utils.packages import attempt_import, import_dcc, import_html
 from meerschaum.utils.typing import SuccessTuple, List
 from meerschaum.config.static import STATIC_CONFIG
 from meerschaum.utils.misc import remove_ansi
-from meerschaum.actions import get_shell
+from meerschaum._internal.shell.Shell import get_shell_intro
 from meerschaum.api import endpoints, CHECK_UPDATE
 from meerschaum.connectors import instance_types
 from meerschaum.utils.misc import get_connector_labels
@@ -69,7 +69,10 @@ bottom_buttons_content = dbc.Card(
         ])
     )
 )
-console_div = html.Div(id='console-div', children=[html.Pre(get_shell().intro, id='console-pre')])
+console_div = html.Div(
+    id = 'console-div',
+    children = [html.Pre(get_shell_intro(), id='console-pre')],
+)
 
 location = dcc.Location(id='location', refresh=False)
 

meerschaum/config/_default.py

@@ -110,6 +110,7 @@ default_system_config = {
         'space': False,
         'join_fetch': False,
         'inplace_sync': True,
+        'uv_pip': True,
     },
 }
 default_pipes_config = {

meerschaum/config/_paths.py

@@ -82,24 +82,24 @@ for _plugin_path in _plugins_paths_to_remove:
 
 ENVIRONMENT_VENVS_DIR = STATIC_CONFIG['environment']['venvs']
 if ENVIRONMENT_VENVS_DIR in os.environ:
-    VENVS_DIR_PATH = Path(os.environ[ENVIRONMENT_VENVS_DIR]).resolve()
-    if not VENVS_DIR_PATH.exists():
+    _VENVS_DIR_PATH = Path(os.environ[ENVIRONMENT_VENVS_DIR]).resolve()
+    if not _VENVS_DIR_PATH.exists():
         try:
-            VENVS_DIR_PATH.mkdir(parents=True, exist_ok=True)
+            _VENVS_DIR_PATH.mkdir(parents=True, exist_ok=True)
         except Exception as e:
             print(
                 f"Invalid path set for environment variable '{ENVIRONMENT_VENVS_DIR}':\n"
-                + f"{VENVS_DIR_PATH}"
+                + f"{_VENVS_DIR_PATH}"
             )
-            VENVS_DIR_PATH = (_ROOT_DIR_PATH / 'venvs').resolve()
-            print(f"Will use the following path for venvs instead:\n{VENVS_DIR_PATH}")
+            _VENVS_DIR_PATH = (_ROOT_DIR_PATH / 'venvs').resolve()
+            print(f"Will use the following path for venvs instead:\n{_VENVS_DIR_PATH}")
 else:
-    VENVS_DIR_PATH = _ROOT_DIR_PATH / 'venvs'
+    _VENVS_DIR_PATH = _ROOT_DIR_PATH / 'venvs'
 
 paths = {
-    'PACKAGE_ROOT_PATH'              : str(Path(__file__).parent.parent.resolve()),
-    'ROOT_DIR_PATH'                  : str(_ROOT_DIR_PATH),
-    'VIRTENV_RESOURCES_PATH'         : str(VENVS_DIR_PATH),
+    'PACKAGE_ROOT_PATH'              : Path(__file__).parent.parent.resolve().as_posix(),
+    'ROOT_DIR_PATH'                  : _ROOT_DIR_PATH.as_posix(),
+    'VIRTENV_RESOURCES_PATH'         : _VENVS_DIR_PATH.as_posix(),
     'CONFIG_DIR_PATH'                : ('{ROOT_DIR_PATH}', 'config'),
     'DEFAULT_CONFIG_DIR_PATH'        : ('{ROOT_DIR_PATH}', 'default_config'),
     'PATCH_DIR_PATH'                 : ('{ROOT_DIR_PATH}', 'patch_config'),
@@ -186,7 +186,6 @@ def __getattr__(name: str) -> Path:
     if name.endswith('RESOURCES_PATH') or name == 'CONFIG_DIR_PATH':
         path.mkdir(parents=True, exist_ok=True)
     elif 'FILENAME' in name:
-        path = str(path)
+        path = path.as_posix()
 
     return path
-

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.2.1"
+__version__ = "2.2.2rc2"

meerschaum/config/paths.py

@@ -0,0 +1,10 @@
+#! /usr/bin/env python3
+# -*- coding: utf-8 -*-
+# vim:fenc=utf-8
+
+"""
+External API for importing Meerschaum paths.
+"""
+
+from meerschaum.config._paths import __getattr__, paths
+__all__ = tuple(paths.keys())

meerschaum/config/static/__init__.py

@@ -110,7 +110,7 @@ STATIC_CONFIG: Dict[str, Any] = {
                 'pbkdf2_sha256',
             ],
             'default': 'pbkdf2_sha256',
-            'pbkdf2_sha256__default_rounds': 3_000_000,
+            'pbkdf2_sha256__default_rounds': 1_000_000,
         },
         'min_username_length': 1,
         'max_username_length': 26,

meerschaum/core/Pipe/_sync.py

@@ -215,9 +215,8 @@ def sync(
 
             ### Activate and invoke `sync(pipe)` for plugin connectors with `sync` methods.
             try:
-                if p.connector.type == 'plugin' and p.connector.sync is not None:
-                    connector_plugin = Plugin(p.connector.label)
-                    with Venv(connector_plugin, debug=debug):
+                if getattr(p.connector, 'sync', None) is not None:
+                    with Venv(get_connector_plugin(p.connector), debug=debug):
                         return_tuple = p.connector.sync(p, debug=debug, **kw)
                     p._exists = None
                     if not isinstance(return_tuple, tuple):

meerschaum/utils/packages/__init__.py

@@ -46,6 +46,8 @@ def get_module_path(
     """
     Get a module's path without importing.
     """
+    import site
+    import pathlib
     if debug:
         from meerschaum.utils.debug import dprint
     if not _try_install_name_on_fail:
@@ -54,33 +56,52 @@ def get_module_path(
         import_name_lower = install_name_lower
     else:
         import_name_lower = import_name.lower().replace('-', '_')
+
     vtp = venv_target_path(venv, allow_nonexistent=True, debug=debug)
     if not vtp.exists():
         if debug:
             dprint(f"Venv '{venv}' does not exist, cannot import '{import_name}'.", color=False)
         return None
+
+    venv_target_candidate_paths = [vtp]
+    if venv is None:
+        site_user_packages_dirs = [pathlib.Path(site.getusersitepackages())]
+        site_packages_dirs = [pathlib.Path(path) for path in site.getsitepackages()]
+
+        paths_to_add = [
+            path
+            for path in site_user_packages_dirs + site_packages_dirs
+            if path not in venv_target_candidate_paths
+        ]
+        venv_target_candidate_paths += paths_to_add
+
     candidates = []
-    for file_name in os.listdir(vtp):
-        file_name_lower = file_name.lower().replace('-', '_')
-        if not file_name_lower.startswith(import_name_lower):
-            continue
-        if file_name.endswith('dist_info'):
+    for venv_target_candidate in venv_target_candidate_paths:
+        try:
+            file_names = os.listdir(venv_target_candidate)
+        except FileNotFoundError:
             continue
-        file_path = vtp / file_name
+        for file_name in file_names:
+            file_name_lower = file_name.lower().replace('-', '_')
+            if not file_name_lower.startswith(import_name_lower):
+                continue
+            if file_name.endswith('dist_info'):
+                continue
+            file_path = venv_target_candidate / file_name
 
-        ### Most likely: Is a directory with __init__.py
-        if file_name_lower == import_name_lower and file_path.is_dir():
-            init_path = file_path / '__init__.py'
-            if init_path.exists():
-                candidates.append(init_path)
+            ### Most likely: Is a directory with __init__.py
+            if file_name_lower == import_name_lower and file_path.is_dir():
+                init_path = file_path / '__init__.py'
+                if init_path.exists():
+                    candidates.append(init_path)
 
-        ### May be a standalone .py file.
-        elif file_name_lower == import_name_lower + '.py':
-            candidates.append(file_path)
+            ### May be a standalone .py file.
+            elif file_name_lower == import_name_lower + '.py':
+                candidates.append(file_path)
 
-        ### Compiled wheels (e.g. pyodbc)
-        elif file_name_lower.startswith(import_name_lower + '.'):
-            candidates.append(file_path)
+            ### Compiled wheels (e.g. pyodbc)
+            elif file_name_lower.startswith(import_name_lower + '.'):
+                candidates.append(file_path)
 
     if len(candidates) == 1:
         return candidates[0]
@@ -466,12 +487,13 @@ def _get_package_metadata(import_name: str, venv: Optional[str]) -> Dict[str, st
     import re
     from meerschaum.config._paths import VIRTENV_RESOURCES_PATH
     install_name = _import_to_install_name(import_name)
-    _args = ['show', install_name]
+    _args = ['pip', 'show', install_name]
     if venv is not None:
         cache_dir_path = VIRTENV_RESOURCES_PATH / venv / 'cache'
-        _args += ['--cache-dir', str(cache_dir_path)]
+        _args += ['--cache-dir', cache_dir_path.as_posix()]
+
     proc = run_python_package(
-        'pip', _args,
+        'uv', _args,
         capture_output=True, as_proc=True, venv=venv, universal_newlines=True,
     )
     outs, errs = proc.communicate()
@@ -721,6 +743,7 @@ def pip_install(
         check_pypi: bool = True,
         check_wheel: bool = True,
         _uninstall: bool = False,
+        _install_uv_pip: bool = True,
         color: bool = True,
         silent: bool = False,
         debug: bool = False,
@@ -776,6 +799,7 @@ def pip_install(
 
     """
     from meerschaum.config._paths import VIRTENV_RESOURCES_PATH
+    from meerschaum.config import get_config
     from meerschaum.utils.warnings import warn
     if args is None:
         args = ['--upgrade'] if not _uninstall else []
@@ -787,9 +811,38 @@ def pip_install(
         have_wheel = venv_contains_package('wheel', venv=venv, debug=debug)
 
     _args = list(args)
-    have_pip = venv_contains_package('pip', venv=venv, debug=debug)
+    have_pip = venv_contains_package('pip', venv=None, debug=debug)
+    try:
+        import pip
+        have_pip = True
+    except ImportError:
+        have_pip = False
+    try:
+        import uv
+        uv_bin = uv.find_uv_bin()
+        have_uv_pip = True
+    except (ImportError, FileNotFoundError):
+        uv_bin = None
+        have_uv_pip = False
+    if have_pip and not have_uv_pip and _install_uv_pip:
+        if not pip_install(
+            'uv',
+            venv = None,
+            debug = debug,
+            _install_uv_pip = False,
+            check_update = False,
+            check_pypi = False,
+            check_wheel = False,
+        ):
+            warn(
+                f"Failed to install `uv` for virtual environment '{venv}'.",
+                color = False,
+            )
+
+    use_uv_pip = venv_contains_package('uv', venv=None, debug=debug) and uv_bin is not None
+
     import sys
-    if not have_pip:
+    if not have_pip and not use_uv_pip:
         if not get_pip(venv=venv, debug=debug):
             import sys
             minor = sys.version_info.minor
@@ -806,13 +859,18 @@ def pip_install(
     
     with Venv(venv, debug=debug):
         if venv is not None:
-            if '--ignore-installed' not in args and '-I' not in _args and not _uninstall:
+            if (
+                '--ignore-installed' not in args
+                and '-I' not in _args
+                and not _uninstall
+                and not use_uv_pip
+            ):
                 _args += ['--ignore-installed']
             if '--cache-dir' not in args and not _uninstall:
                 cache_dir_path = VIRTENV_RESOURCES_PATH / venv / 'cache'
                 _args += ['--cache-dir', str(cache_dir_path)]
 
-        if 'pip' not in ' '.join(_args):
+        if 'pip' not in ' '.join(_args) and not use_uv_pip:
             if check_update and not _uninstall:
                 pip = attempt_import('pip', venv=venv, install=False, debug=debug, lazy=False)
                 if need_update(pip, check_pypi=check_pypi, debug=debug):
@@ -820,13 +878,16 @@ def pip_install(
         
         _args = (['install'] if not _uninstall else ['uninstall']) + _args
 
-        if check_wheel and not _uninstall:
+        if check_wheel and not _uninstall and not use_uv_pip:
             if not have_wheel:
                 if not pip_install(
-                    'setuptools', 'wheel',
+                    'setuptools', 'wheel', 'uv',
                     venv = venv,
-                    check_update = False, check_pypi = False,
-                    check_wheel = False, debug = debug,
+                    check_update = False,
+                    check_pypi = False,
+                    check_wheel = False,
+                    debug = debug,
+                    _install_uv_pip = False,
                 ):
                     warn(
                         (
@@ -838,21 +899,21 @@ def pip_install(
 
         if requirements_file_path is not None:
             _args.append('-r')
-            _args.append(str(pathlib.Path(requirements_file_path).resolve()))
+            _args.append(pathlib.Path(requirements_file_path).resolve().as_posix())
 
         if not ANSI and '--no-color' not in _args:
             _args.append('--no-color')
 
-        if '--no-input' not in _args:
+        if '--no-input' not in _args and not use_uv_pip:
             _args.append('--no-input')
 
-        if _uninstall and '-y' not in _args:
+        if _uninstall and '-y' not in _args and not use_uv_pip:
             _args.append('-y')
 
-        if '--no-warn-conflicts' not in _args and not _uninstall:
+        if '--no-warn-conflicts' not in _args and not _uninstall and not use_uv_pip:
             _args.append('--no-warn-conflicts')
 
-        if '--disable-pip-version-check' not in _args:
+        if '--disable-pip-version-check' not in _args and not use_uv_pip:
             _args.append('--disable-pip-version-check')
 
         if '--target' not in _args and '-t' not in _args and not _uninstall:
@@ -863,12 +924,16 @@ def pip_install(
                 and '-t' not in _args
                 and not inside_venv()
                 and not _uninstall
+                and not use_uv_pip
         ):
             _args += ['--user']
+        if '--break-system-packages' not in _args and not _uninstall:
+            _args.append('--break-system-packages')
 
         if debug:
             if '-v' not in _args or '-vv' not in _args or '-vvv' not in _args:
-                pass
+                if use_uv_pip:
+                    _args.append('--verbose')
         else:
             if '-q' not in _args or '-qq' not in _args or '-qqq' not in _args:
                 pass
@@ -883,7 +948,7 @@ def pip_install(
         if not silent:
             print(msg)
 
-        if not _uninstall:
+        if _uninstall:
             for install_name in _packages:
                 _install_no_version = get_install_no_version(install_name)
                 if _install_no_version in ('pip', 'wheel'):
@@ -896,10 +961,15 @@ def pip_install(
                         f"Failed to clean up package '{_install_no_version}'.",
                     )
 
+        if use_uv_pip:
+            _args.insert(0, 'pip')
+            if not _uninstall:
+                _args.append('--prerelease=allow')
+
         rc = run_python_package(
-            'pip',
+            ('pip' if not use_uv_pip else 'uv'),
             _args + _packages,
-            venv = venv,
+            venv = None,
             env = _get_pip_os_env(),
             debug = debug,
         )
@@ -1031,6 +1101,10 @@ def run_python_package(
     if cwd is not None:
         os.chdir(cwd)
     executable = venv_executable(venv=venv)
+    venv_path = (VIRTENV_RESOURCES_PATH / venv) if venv is not None else None
+    env_dict = kw.get('env', os.environ).copy()
+    if venv_path is not None:
+        env_dict.update({'VIRTUAL_ENV': venv_path.as_posix()})
     command = [executable, '-m', str(package_name)] + [str(a) for a in args]
     import traceback
     if debug:
@@ -1055,7 +1129,7 @@ def run_python_package(
             command,
             stdout = stdout,
             stderr = stderr,
-            env = kw.get('env', os.environ),
+            env = env_dict,
         )
         to_return = proc if as_proc else proc.wait()
     except KeyboardInterrupt:
@@ -1623,6 +1697,8 @@ def venv_contains_package(
     """
     Search the contents of a virtual environment for a package.
     """
+    import site
+    import pathlib
     root_name = import_name.split('.')[0] if split else import_name
     return get_module_path(root_name, venv=venv, debug=debug) is not None
 

meerschaum/utils/packages/_packages.py

@@ -53,6 +53,7 @@ packages: Dict[str, Dict[str, str]] = {
         'dill'                       : 'dill>=0.3.3',
         'virtualenv'                 : 'virtualenv>=20.1.0',
         'apscheduler'                : 'APScheduler>=4.0.0a5',
+        'uv'                         : 'uv>=0.2.11',
     },
     'drivers': {
         'cryptography'               : 'cryptography>=38.0.1',

meerschaum/utils/process.py

@@ -147,7 +147,6 @@ def run_process(
             store_proc_dict[store_proc_key] = child
         _ret = poll_process(child, line_callback) if line_callback is not None else child.wait()
         ret = _ret if not as_proc else child
-
     finally:
         if foreground:
             # we have to mask SIGTTOU because tcsetpgrp

meerschaum/utils/schedule.py

@@ -8,7 +8,7 @@ Schedule processes and threads.
 
 from __future__ import annotations
 import sys
-from datetime import datetime, timezone, timedelta, timedelta
+from datetime import datetime, timezone, timedelta
 import meerschaum as mrsm
 from meerschaum.utils.typing import Callable, Any, Optional, List, Dict
 

meerschaum/utils/venv/__init__.py

@@ -79,7 +79,7 @@ def activate_venv(
         else:
             threads_active_venvs[thread_id][venv] += 1
 
-        target = str(venv_target_path(venv, debug=debug))
+        target = venv_target_path(venv, debug=debug).as_posix()
         if venv in active_venvs_order:
             sys.path.remove(target)
             try:
@@ -171,7 +171,7 @@ def deactivate_venv(
     if sys.path is None:
         return False
 
-    target = str(venv_target_path(venv, allow_nonexistent=force, debug=debug))
+    target = venv_target_path(venv, allow_nonexistent=force, debug=debug).as_posix()
     with LOCKS['sys.path']:
         if target in sys.path:
             sys.path.remove(target)
@@ -361,6 +361,8 @@ def init_venv(
             verified_venvs.add(venv)
         return True
 
+    import io
+    from contextlib import redirect_stdout, redirect_stderr
     import sys, platform, os, pathlib, shutil
     from meerschaum.config.static import STATIC_CONFIG
     from meerschaum.config._paths import VIRTENV_RESOURCES_PATH
@@ -381,25 +383,34 @@ def init_venv(
             verified_venvs.add(venv)
         return True
 
-    from meerschaum.utils.packages import run_python_package, attempt_import
+    from meerschaum.utils.packages import run_python_package, attempt_import, _get_pip_os_env
     global tried_virtualenv
     try:
         import venv as _venv
+        uv = attempt_import('uv', venv=None, debug=debug)
         virtualenv = None
     except ImportError:
         _venv = None
+        uv = None
         virtualenv = None
-    
 
     _venv_success = False
-    if _venv is not None:
-        import io
-        from contextlib import redirect_stdout
+
+    if uv is not None:
+        _venv_success = run_python_package(
+            'uv',
+            ['venv', venv_path.as_posix(), '-q'],
+            venv = None,
+            env = _get_pip_os_env(),
+            debug = debug,
+        ) == 0
+
+    if _venv is not None and not _venv_success:
         f = io.StringIO()
         with redirect_stdout(f):
             _venv_success = run_python_package(
                 'venv',
-                [str(venv_path)] + (
+                [venv_path.as_posix()] + (
                     ['--symlinks'] if platform.system() != 'Windows' else []
                 ),
                 venv=None, debug=debug
@@ -438,7 +449,7 @@ def init_venv(
                 except Exception as e:
                     import traceback
                     traceback.print_exc()
-            virtualenv.cli_run([str(venv_path)])
+            virtualenv.cli_run([venv_path.as_posix()])
             if dist_packages_path.exists():
                 vtp.mkdir(exist_ok=True, parents=True)
                 for file_path in dist_packages_path.glob('*'):
@@ -614,7 +625,7 @@ def venv_target_path(
                     return site_path
 
                 ### Allow for dist-level paths (running as root).
-                for possible_dist in reversed(site.getsitepackages()):
+                for possible_dist in site.getsitepackages():
                     dist_path = pathlib.Path(possible_dist)
                     if not dist_path.exists():
                         continue

{meerschaum-2.2.1.dist-info → meerschaum-2.2.2rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.1
+Version: 2.2.2rc2
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -79,6 +79,7 @@ Requires-Dist: watchfiles >=0.21.0 ; extra == 'api'
 Requires-Dist: dill >=0.3.3 ; extra == 'api'
 Requires-Dist: virtualenv >=20.1.0 ; extra == 'api'
 Requires-Dist: APScheduler >=4.0.0a5 ; extra == 'api'
+Requires-Dist: uv >=0.2.11 ; extra == 'api'
 Requires-Dist: pprintpp >=0.4.0 ; extra == 'api'
 Requires-Dist: asciitree >=0.3.3 ; extra == 'api'
 Requires-Dist: typing-extensions >=4.7.1 ; extra == 'api'
@@ -127,6 +128,7 @@ Requires-Dist: watchfiles >=0.21.0 ; extra == 'core'
 Requires-Dist: dill >=0.3.3 ; extra == 'core'
 Requires-Dist: virtualenv >=20.1.0 ; extra == 'core'
 Requires-Dist: APScheduler >=4.0.0a5 ; extra == 'core'
+Requires-Dist: uv >=0.2.11 ; extra == 'core'
 Provides-Extra: dash
 Requires-Dist: Flask-Compress >=1.10.1 ; extra == 'dash'
 Requires-Dist: dash >=2.6.2 ; extra == 'dash'
@@ -212,6 +214,7 @@ Requires-Dist: watchfiles >=0.21.0 ; extra == 'full'
 Requires-Dist: dill >=0.3.3 ; extra == 'full'
 Requires-Dist: virtualenv >=20.1.0 ; extra == 'full'
 Requires-Dist: APScheduler >=4.0.0a5 ; extra == 'full'
+Requires-Dist: uv >=0.2.11 ; extra == 'full'
 Requires-Dist: cryptography >=38.0.1 ; extra == 'full'
 Requires-Dist: psycopg[binary] >=3.1.18 ; extra == 'full'
 Requires-Dist: PyMySQL >=0.9.0 ; extra == 'full'
@@ -295,6 +298,7 @@ Requires-Dist: watchfiles >=0.21.0 ; extra == 'sql'
 Requires-Dist: dill >=0.3.3 ; extra == 'sql'
 Requires-Dist: virtualenv >=20.1.0 ; extra == 'sql'
 Requires-Dist: APScheduler >=4.0.0a5 ; extra == 'sql'
+Requires-Dist: uv >=0.2.11 ; extra == 'sql'
 Provides-Extra: stack
 Requires-Dist: docker-compose >=1.29.2 ; extra == 'stack'
 

{meerschaum-2.2.1.dist-info → meerschaum-2.2.2rc2.dist-info}/RECORD

@@ -12,16 +12,16 @@ 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=zcgajt0FGH5ou0kqmOrYAvNfunOsn_CN6LHFYFXBBlI,32826
+meerschaum/_internal/shell/Shell.py,sha256=NqRowEvTUd-7uuamD_X6mt2Nw3yfuDW7z_g5sfay0Og,33194
 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
 meerschaum/_internal/term/TermPageHandler.py,sha256=Rt5S47Pr_3HLJc8xIXpZUczYE_Dw2qT8qwf1jZFtUHQ,520
-meerschaum/_internal/term/__init__.py,sha256=xIwEWXyq1qaU7Rx-AryTtANJPdm__fy3XSMzxaFn0wU,1594
-meerschaum/_internal/term/tools.py,sha256=bpYexJBDCQXfzz6ESMvmpSHM1AIy4qWsrAHl95tSW2I,716
+meerschaum/_internal/term/__init__.py,sha256=QZQerwLmqE6SS1MHH8HbZkoUunLhhcmZDmPf52y2dhM,1583
+meerschaum/_internal/term/tools.py,sha256=dXVAimKD-Yv2fg2WOTr0YGBY7XDKjQqw-RizcS65YVI,727
 meerschaum/actions/__init__.py,sha256=7CNoKEqkqqafqMcChspJX9cR9OdgEWk9ggj0000Jl98,11360
-meerschaum/actions/api.py,sha256=mWhv4bn3Ap17_Gqf2Cx9bAsHKG-Zhy072pBbNzHLEJc,12756
+meerschaum/actions/api.py,sha256=pBVTGq9iI7rRspPPkilJthIxi6JDt6LsVXu2NXNHN_Y,14262
 meerschaum/actions/bootstrap.py,sha256=JnIyJ4odw6cA4e0Cw7J8THkLavMcj68nRyGsQDAT8nc,13396
 meerschaum/actions/clear.py,sha256=OoFZE0bK5m8s3GLNZcixuVT0DMj1izXVxGCATcmUGbI,4851
 meerschaum/actions/copy.py,sha256=8g3ANXfVdvuyaoXcZjgTg3BxHTOhHGrzVDOOsTBrpSU,6213
@@ -33,7 +33,7 @@ meerschaum/actions/install.py,sha256=akzzgsvy5yqUFuUqzSMG4eBKARY2iSnL3n_BiaNcM58
 meerschaum/actions/login.py,sha256=fNgsgkrFCn9wBQJY50SQhz2PwsN_TvEYYHnXK3JG4ig,4206
 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/python.py,sha256=pdrgBCGdoYGFwVoyo71Q59hLS1vwzPHAW71U3JdroYo,2831
 meerschaum/actions/register.py,sha256=l_21LWZCzKwJVex_xAXECC5WVW1VEuIX9HSp7CuyCwA,11326
 meerschaum/actions/reload.py,sha256=gMXeFBGVfyQ7uhKhYf6bLaDMD0fLPcA9BrLBSiuvWIc,508
 meerschaum/actions/setup.py,sha256=KkAGWcgwzl_L6A19fTmTX1KtBjW2FwD8QenLjPy0mQQ,3205
@@ -41,21 +41,21 @@ meerschaum/actions/sh.py,sha256=fLfTJaacKu4sjLTRqEzzYlT2WbbdZBEczsKb6F-qAek,2026
 meerschaum/actions/show.py,sha256=p92UahbFeKOThGooO8Ul5Z6s6_Ll54FCxXsMAFnhuT0,29024
 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
+meerschaum/actions/start.py,sha256=9Ej3Hk7qXfbrBaQq17KirTII_4Pa-BWSdrkutMnLA3k,18352
 meerschaum/actions/stop.py,sha256=KTBadAmJ6SbReqlltkwfqZW6EryB4kZXupl0ZyInI0Q,4311
 meerschaum/actions/sync.py,sha256=10uPREu3HBVgtzakVxhCegQOz_mistABJlsNNCMgywY,17518
 meerschaum/actions/tag.py,sha256=SJf5qFW0ccLXjqlTdkK_0MCcrCMdg6xhYrhKdco0hdA,3053
 meerschaum/actions/uninstall.py,sha256=2fUd5ZK45VGGCI8V4NLmSnavdKjOv7cGM22x2WlTStw,6068
-meerschaum/actions/upgrade.py,sha256=VQKyjCGioEF2FYbQmldHh21imDqApNl0xal0rhxzrJk,6302
+meerschaum/actions/upgrade.py,sha256=w0f7QmJcOMU6RuwvLNCQBJgFV0iQe9jDrH1nZZEmvRk,6301
 meerschaum/actions/verify.py,sha256=tY5slGpHiWiE0v9TDnjbmxSKn86zBnu9WBpixUgKNQU,4885
-meerschaum/api/__init__.py,sha256=LEAAhOBNT6VHRTiLKWfVxBHBbqeucilHXLelrPkxjZI,7385
+meerschaum/api/__init__.py,sha256=oOYwNnkXM2s-h52EYnN2NGPfrlaQh6D4-zmHa7uPLG0,7450
 meerschaum/api/_chain.py,sha256=h8-WXUGXX6AqzdALfsBC5uv0FkAcLdHJXCGzqzuq89k,875
 meerschaum/api/_events.py,sha256=NrjiabEr7rmHMfxnX07DOGzr9sPiEbRkFqPjuA_8Zx8,1603
 meerschaum/api/_oauth2.py,sha256=He8JnFDhfCq25Wlz1Jh3TcGz83VOttrJk6RgzJKbFLw,1056
 meerschaum/api/_websockets.py,sha256=OmrSDGx3xGlfP5XXeLEyYW6-Y3iRUcB-xSqL3RWsjqQ,1609
 meerschaum/api/dash/__init__.py,sha256=yr4zR7uFPlLFc_lDpwa2rCM1h9ZWGiu5-2XhHcM-5f8,2252
 meerschaum/api/dash/actions.py,sha256=eUClPPdNVNSCtyq8Ecr1saasxj5VBgd1gcXejvQxXEc,9418
-meerschaum/api/dash/components.py,sha256=hdcxQahw9lHDBlZlztj-IKX4GueZRTVKfjGC6fFcj_8,6364
+meerschaum/api/dash/components.py,sha256=oGX7HFzNCi37iMww747iL3bbB52ZTt9tFa2iLohffg4,6399
 meerschaum/api/dash/connectors.py,sha256=nJxBOFldtCMJLYjUSVYZwX5BO-LNjTNHgoEaXe-0XMo,843
 meerschaum/api/dash/graphs.py,sha256=wJUDWzcLN8-C3xko6rj0F2v7Rt8YDkSXoVkkXJjYGIk,2046
 meerschaum/api/dash/jobs.py,sha256=htqnrtAGCOgn2-THezMGYM8n1E-M-sM5A5qNmOGfHzg,7529
@@ -124,25 +124,26 @@ 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/_dash.py,sha256=BJHl4xMrQB-YHUEU7ldEW8q_nOPoIRSOqLrfGElc6Dw,187
-meerschaum/config/_default.py,sha256=DSbyVcAL55Xf8MJCTxpgF7ZXL-O9peeMEqL29WFfsJ4,5251
+meerschaum/config/_default.py,sha256=J6AWxxXM4mntCdkM6bKIpyQznZ5NuMICmTaurF11J9Q,5275
 meerschaum/config/_edit.py,sha256=CE8gumBiOtnZZdTATCLAZgUnhL04yJdReaNCrv1yuJc,8218
 meerschaum/config/_environment.py,sha256=Vv4DLDfc2vKLbCLsMvkQDj77K4kEvHKEBmUBo-wCrgo,4419
 meerschaum/config/_formatting.py,sha256=RT_oU0OSfUkzeqbY5jvEJwuove_t9sP4MyUb1Px250U,6635
 meerschaum/config/_jobs.py,sha256=2bEikO48qVSguFS3lrbWz6uiKt_0b3oSRWhwyz8RRDM,1279
 meerschaum/config/_patch.py,sha256=21N30q1ANmWMDQ-2RUjpMx7KafWfPQ3lKx9rrMqg1s4,1526
-meerschaum/config/_paths.py,sha256=TihDGA6IQou3ms1xKYHmRTU48kOflqV5ZOMguG25NM4,8154
+meerschaum/config/_paths.py,sha256=xS7zim8Dr7LIJQBTzDH8IOhTZ4AHMvc5a1np8SGX4Rg,8185
 meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6wLs,1220
 meerschaum/config/_read_config.py,sha256=WFZKIXZMDe_ca0ES7ivgM_mnwShvFxLdoeisT_X5-h0,14720
 meerschaum/config/_shell.py,sha256=s74cmJl8NrhM_Y1cB_P41_JDUYXV0g4WXnKFZWMtnrY,3551
 meerschaum/config/_sync.py,sha256=oK2ZujO2T1he08BXCFyiniBUevNGWSQKXLcS_jRv_7Y,4155
-meerschaum/config/_version.py,sha256=OydT3amCDUZG1dyzap3MREBRuMd53MMaduOv0qZtPL8,71
+meerschaum/config/_version.py,sha256=EInJbGE14rCfVET_lXzEeEKw-tGc7n8tgXJiPluDNic,74
+meerschaum/config/paths.py,sha256=Z7vaOunaEJbVFXiSSz4IthhNOQDI-dhtpi5TpSyrcXg,206
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=c_WdTSejVdj8lqSE_pK5MhIBkHoftiZWDuEuB9dmk2I,9007
 meerschaum/config/stack/grafana/__init__.py,sha256=LNXQw2FvHKrD68RDhqDmi2wJjAHaKw9IWx8rNuyWEPo,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=zsSq54OkLqjfG_QGyH6zXzZnoaGpDyjmV0OCvbygFr8,4474
+meerschaum/config/static/__init__.py,sha256=d3bkER5FJwsvrL8TM5V8Vmy0Bi7Fq7H8U-4jjfpV4Og,4474
 meerschaum/connectors/Connector.py,sha256=cJKinmk7eWZwCBvtX4H9r66macTZOY1qjxR7JUEmDmg,6381
 meerschaum/connectors/__init__.py,sha256=zXumYuKTWOyu3U6J1zvMQS30HImYLE8ssBdJs-I134M,12106
 meerschaum/connectors/parse.py,sha256=gidA2jvOLTvEeL5hM9JjcUwkMRBadUhd4IfA5Jy1tgg,4044
@@ -188,7 +189,7 @@ meerschaum/core/Pipe/_edit.py,sha256=ZH2A0ZOpZKsVDnQxKzmXspNQKTEFUhkkZDjwOkmWtaY
 meerschaum/core/Pipe/_fetch.py,sha256=zV3DzD7kfx08O6zda0I-9cX91m0Z_wO_on1ozHaqWnk,5234
 meerschaum/core/Pipe/_register.py,sha256=Sd5xaAW8H7uLTIoommcKb-6kHPRuHJLWNSbPnt2UbvA,2240
 meerschaum/core/Pipe/_show.py,sha256=nG50y8eBT9TVuKkRgAKtNDNIxysJvMNxfu__lkL1F9k,1352
-meerschaum/core/Pipe/_sync.py,sha256=48qk1xvkcKOqfzzYf3QdA7ojsP80yrso1YU8QIGJxwE,28038
+meerschaum/core/Pipe/_sync.py,sha256=g_cQ4e4fd6_8qzjOjSH4hhO5vy2y0ZF8InOP9Lolzj8,27975
 meerschaum/core/Pipe/_verify.py,sha256=KSnthUzImRLjt9fxyBaLvArqDuOLRpKBfk0tnseJClc,14262
 meerschaum/core/Plugin/__init__.py,sha256=UXg64EvJPgI1PCxkY_KM02-ZmBm4FZpLPIQR_uSJJDc,137
 meerschaum/core/User/_User.py,sha256=CApB7Y0QJL6S9QOCCfrG4SbPuPXJ9AsAYQ5pASMP_Aw,6527
@@ -203,9 +204,9 @@ meerschaum/utils/interactive.py,sha256=t-6jWozXSqL7lYGDHuwiOjTgr-UKhdcg61q_eR5mi
 meerschaum/utils/misc.py,sha256=H26hLtCP8QHwXoHlvkxjWu6cPTwudDbbsbRkGw6ultg,43296
 meerschaum/utils/networking.py,sha256=Sr_eYUGW8_UV9-k9LqRFf7xLtbUcsDucODyLCRsFRUc,1006
 meerschaum/utils/pool.py,sha256=vkE42af4fjrTEJTxf6Ek3xGucm1MtEkpsSEiaVzNKHs,2655
-meerschaum/utils/process.py,sha256=IHnUhX79XofHwMsOs1A_irLMa7i48xXB-GCL83MtZOY,7192
+meerschaum/utils/process.py,sha256=BFT9ntuTSlIXTLFGGSnrjgUlJqCLzbOHfIf6iCcuf9A,7191
 meerschaum/utils/prompt.py,sha256=0mBFbgi_l9rCou9UnC_6qKTHkqyl1Z_jSRzfmc0xRXM,16490
-meerschaum/utils/schedule.py,sha256=2UpXg5E9mfjg83w3N6C2_Q7tlE2exVJehro2Bvp6PzQ,10871
+meerschaum/utils/schedule.py,sha256=btAeSDaoFH62-7wTO0U7NK9P9QHV46PtY3DJ8DN_mCY,10860
 meerschaum/utils/sql.py,sha256=4sCNEpgUd6uFz6ySs4nnUMVaOT0YAvPM1ZlQYJTSF-0,46656
 meerschaum/utils/threading.py,sha256=3N8JXPAnwqJiSjuQcbbJg3Rv9-CCUMJpeQRfKFR7MaA,2489
 meerschaum/utils/typing.py,sha256=L05wOXfWdn_nJ0KnZVr-2zdMYcqjdyOW_7InT3xe6-s,2807
@@ -223,16 +224,16 @@ meerschaum/utils/formatting/_jobs.py,sha256=s1lVcdMkzNj5Bqw-GsUhcguUFtahi5nQ-kg1
 meerschaum/utils/formatting/_pipes.py,sha256=wy0iWJFsFl3X2VloaiA_gp9Yx9w6tD3FQZvAQAqef4A,19492
 meerschaum/utils/formatting/_pprint.py,sha256=tgrT3FyGyu5CWJYysqK3kX1xdZYorlbOk9fcU_vt9Qg,3096
 meerschaum/utils/formatting/_shell.py,sha256=ox75O7VHDAiwzSvdMSJZhXLadvAqYJVeihU6WeZ2Ogc,3677
-meerschaum/utils/packages/__init__.py,sha256=HEJYz_rceqljpyRFlnToLR6vc_b7r-2d2K8zh_th2lg,57185
-meerschaum/utils/packages/_packages.py,sha256=P1Y0mc0TlX5iCL08U-4WkMG9LpEt_REWo30GJUn38cM,7865
+meerschaum/utils/packages/__init__.py,sha256=TTNgCWgIpdyG21Pk86dDne7eTG02_0nERxopLBD1tHo,59811
+meerschaum/utils/packages/_packages.py,sha256=kWoo1KWvpQgR3rY_rpHzvGIh14BBFH92Erw5UtW7yX0,7918
 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=sj-n8scWH2NPDJGAxfpqzsYqVUt2jMEr-7Uq9G7YUNQ,23183
-meerschaum-2.2.1.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.2.1.dist-info/METADATA,sha256=XUYdU9OV2qtydf3XiXIvkA0gE-Nikh43zj_KRqA4ruo,23807
-meerschaum-2.2.1.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.2.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-meerschaum-2.2.1.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.2.1.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.2.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.2.1.dist-info/RECORD,,
+meerschaum/utils/venv/__init__.py,sha256=iVBBncvP_1FHaxpRo4BGDdTc6AXvP3sO_NXUuwdJWOU,23557
+meerschaum-2.2.2rc2.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.2.2rc2.dist-info/METADATA,sha256=Fuc1OkYDzgjosH8VDHUmwZdpJsYK8aMApbiLipzUAx0,23988
+meerschaum-2.2.2rc2.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.2.2rc2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+meerschaum-2.2.2rc2.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.2.2rc2.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.2.2rc2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.2.2rc2.dist-info/RECORD,,