meerschaum 2.4.1__py3-none-any.whl → 2.4.2__py3-none-any.whl

meerschaum/actions/bootstrap.py

@@ -336,7 +336,7 @@ def _bootstrap_connectors(
             return abort_tuple
         new_attributes['flavor'] = flavor
         required = sorted(list(connector_attributes[_type]['flavors'][flavor]['requirements']))
-        required = sorted(list(connector_attributes[_type]['flavors'][flavor]['optional']))
+        optional = sorted(list(connector_attributes[_type]['flavors'][flavor].get('optional', {})))
         default = type_attributes['flavors'][flavor].get('defaults', {})
     else:
         required = sorted(list(type_attributes.get('required', {})))

meerschaum/config/__init__.py

@@ -79,15 +79,15 @@ def set_config(cf: Dict[str, Any]) -> Dict[str, Any]:
 
 
 def get_config(
-        *keys: str,
-        patch: bool = True,
-        substitute: bool = True,
-        sync_files: bool = True,
-        write_missing: bool = True,
-        as_tuple: bool = False,
-        warn: bool = True,
-        debug: bool = False
-    ) -> Any:
+    *keys: str,
+    patch: bool = True,
+    substitute: bool = True,
+    sync_files: bool = True,
+    write_missing: bool = True,
+    as_tuple: bool = False,
+    warn: bool = True,
+    debug: bool = False
+) -> Any:
     """
     Return the Meerschaum configuration dictionary.
     If positional arguments are provided, index by the keys.

meerschaum/config/_read_config.py

@@ -10,12 +10,12 @@ from meerschaum.utils.typing import Optional, Dict, Any, List, Tuple, Union
 from meerschaum.config import get_config
 
 def read_config(
-        directory: Optional[str] = None,
-        keys: Optional[List[str]] = None,
-        write_missing : bool = True,
-        substitute : bool = True,
-        with_filenames : bool = False,
-    ) -> Union[Dict[str, Any], Tuple[Dict[str, Any], List[str]]]:
+    directory: Optional[str] = None,
+    keys: Optional[List[str]] = None,
+    write_missing : bool = True,
+    substitute : bool = True,
+    with_filenames : bool = False,
+) -> Union[Dict[str, Any], Tuple[Dict[str, Any], List[str]]]:
     """
     Read the configuration directory.
 
@@ -313,10 +313,10 @@ def search_and_substitute_config(
         try:
             valid, value = get_config(
                 *keys,
-                substitute = False,
-                as_tuple = True,
-                write_missing = False,
-                sync_files = False,
+                substitute=False,
+                as_tuple=True,
+                write_missing=False,
+                sync_files=False,
             )
         except Exception as e:
             import traceback

meerschaum/config/_sync.py

@@ -7,17 +7,20 @@ Synchronize across config files
 """
 
 from __future__ import annotations
+import pathlib
 from meerschaum.utils.typing import Optional, List, Tuple
 
+
 def sync_yaml_configs(
-        keys: List[str],
-        sub_path: pathlib.Path,
-        substitute: bool = True,
-        permissions: Optional[int] = None,
-        replace_tuples: Optional[List[Tuple[str, str]]] = None,
-    ) -> None:
-    """Synchronize sub-configuration with main configuration file.
-    
+    keys: List[str],
+    sub_path: pathlib.Path,
+    substitute: bool = True,
+    permissions: Optional[int] = None,
+    replace_tuples: Optional[List[Tuple[str, str]]] = None,
+) -> None:
+    """
+    Synchronize sub-configuration with main configuration file.
+
     Parameters
     ----------
     keys: List[str]
@@ -84,12 +87,14 @@ def sync_yaml_configs(
     new_path = sub_path
 
     ### write changes
+    new_path.parent.mkdir(exist_ok=True, parents=True)
     with open(new_path, 'w+', encoding='utf-8') as f:
         f.write(new_header)
         f.write(new_config_text)
     if permissions is not None:
         os.chmod(new_path, permissions)
 
+
 def sync_files(keys: Optional[List[str]] = None):
     if keys is None:
         keys = []
@@ -110,21 +115,23 @@ def sync_files(keys: Optional[List[str]] = None):
         sync_yaml_configs(
             ['stack', STACK_COMPOSE_FILENAME],
             STACK_COMPOSE_PATH,
-            substitute = True,
-            replace_tuples = [('$', '$$'), ('<DOLLAR>', '$')],
+            substitute=True,
+            replace_tuples=[
+                ('$', '$$'),
+                ('<DOLLAR>', '$'),
+            ],
         )
         sync_yaml_configs(
             ['stack', 'grafana', 'datasource'],
             GRAFANA_DATASOURCE_PATH,
-            substitute = True,
+            substitute=True,
         )
         sync_yaml_configs(
             ['stack', 'grafana', 'dashboard'],
             GRAFANA_DASHBOARD_PATH,
-            substitute = True,
+            substitute=True,
         )
 
-
     key_functions = {
         'stack': _stack,
     }

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.4.1"
+__version__ = "2.4.2"

meerschaum/config/stack/__init__.py

@@ -55,7 +55,7 @@ env_dict['MEERSCHAUM_API_CONFIG'] = json.dumps(
         'meerschaum': 'MRSM{!meerschaum}',
         'system': 'MRSM{!system}',
     },
-    indent = 4,
+    indent=4,
 ).replace(
     '"MRSM{!system}"', 'MRSM{!system}'
 ).replace(

meerschaum/connectors/api/_APIConnector.py

@@ -168,7 +168,8 @@ class APIConnector(Connector):
     @property
     def session(self):
         if self._session is None:
-            requests = attempt_import('requests')
+            certifi = attempt_import('certifi', lazy=False)
+            requests = attempt_import('requests', lazy=False)
             if requests:
                 self._session = requests.Session()
             if self._session is None:

meerschaum/connectors/sql/_create_engine.py

@@ -27,39 +27,39 @@ default_create_engine_args = {
     'connect_args': {},
 }
 flavor_configs = {
-    'timescaledb'      : {
-        'engine'       : 'postgresql+psycopg',
-        'create_engine' : default_create_engine_args,
+    'timescaledb': {
+        'engine': 'postgresql+psycopg',
+        'create_engine': default_create_engine_args,
         'omit_create_engine': {'method',},
-        'to_sql' : {},
-        'requirements' : default_requirements,
-        'defaults'     : {
-            'port'     : 5432,
+        'to_sql': {},
+        'requirements': default_requirements,
+        'defaults': {
+            'port': 5432,
         },
     },
-    'postgresql'         : {
-        'engine'       : 'postgresql+psycopg',
-        'create_engine' : default_create_engine_args,
+    'postgresql': {
+        'engine': 'postgresql+psycopg',
+        'create_engine': default_create_engine_args,
         'omit_create_engine': {'method',},
-        'to_sql' : {},
-        'requirements' : default_requirements,
-        'defaults'     : {
-            'port'     : 5432,
+        'to_sql': {},
+        'requirements': default_requirements,
+        'defaults': {
+            'port': 5432,
         },
     },
-    'citus'            : {
-        'engine'       : 'postgresql+psycopg',
-        'create_engine' : default_create_engine_args,
+    'citus': {
+        'engine': 'postgresql+psycopg',
+        'create_engine': default_create_engine_args,
         'omit_create_engine': {'method',},
-        'to_sql' : {},
-        'requirements' : default_requirements,
-        'defaults'     : {
-            'port'     : 5432,
+        'to_sql': {},
+        'requirements': default_requirements,
+        'defaults': {
+            'port': 5432,
         },
     },
-    'mssql'            : {
-        'engine'       : 'mssql+pyodbc',
-        'create_engine' : {
+    'mssql': {
+        'engine': 'mssql+pyodbc',
+        'create_engine': {
             'fast_executemany': True,
             'isolation_level': 'AUTOCOMMIT',
             'use_setinputsizes': False,
@@ -68,84 +68,81 @@ flavor_configs = {
         'to_sql': {
             'method': None,
         },
-        'requirements' : default_requirements,
-        'defaults'     : {
-            'port'     : 1433,
-            'options'  : {
-                'driver'   : 'ODBC Driver 17 for SQL Server',
-                'UseFMTONLY': 'Yes',
-            },
+        'requirements': default_requirements,
+        'defaults': {
+            'port': 1433,
+            'options': "driver=ODBC Driver 17 for SQL Server&UseFMTONLY=Yes",
         },
     },
-    'mysql'            : {
-        'engine'       : 'mysql+pymysql',
-        'create_engine' : default_create_engine_args,
+    'mysql': {
+        'engine': 'mysql+pymysql',
+        'create_engine': default_create_engine_args,
         'omit_create_engine': {'method',},
         'to_sql': {
             'method': 'multi',
         },
-        'requirements' : default_requirements,
-        'defaults'     : {
-            'port'     : 3306,
+        'requirements': default_requirements,
+        'defaults': {
+            'port': 3306,
         },
     },
-    'mariadb'          : {
-        'engine'       : 'mysql+pymysql',
-        'create_engine' : default_create_engine_args,
+    'mariadb': {
+        'engine': 'mysql+pymysql',
+        'create_engine': default_create_engine_args,
         'omit_create_engine': {'method',},
         'to_sql': {
             'method': 'multi',
         },
-        'requirements' : default_requirements,
-        'defaults'     : {
-            'port'     : 3306,
+        'requirements': default_requirements,
+        'defaults': {
+            'port': 3306,
         },
     },
-    'oracle'           : {
-        'engine'       : 'oracle+cx_oracle',
-        'create_engine' : default_create_engine_args,
+    'oracle': {
+        'engine': 'oracle+cx_oracle',
+        'create_engine': default_create_engine_args,
         'omit_create_engine': {'method',},
         'to_sql': {
             'method': None,
         },
-        'requirements' : default_requirements,
-        'defaults'     : {
-            'port'     : 1521,
+        'requirements': default_requirements,
+        'defaults': {
+            'port': 1521,
         },
     },
-    'sqlite'           : {
-        'engine'       : 'sqlite',
-        'create_engine' : default_create_engine_args,
+    'sqlite': {
+        'engine': 'sqlite',
+        'create_engine': default_create_engine_args,
         'omit_create_engine': {'method',},
         'to_sql': {
             'method': 'multi',
         },
-        'requirements' : {'database'},
-        'defaults'     : {},
+        'requirements': {'database'},
+        'defaults': {},
     },
-    'duckdb' : {
-        'engine' : 'duckdb',
-        'create_engine' : {},
+    'duckdb': {
+        'engine': 'duckdb',
+        'create_engine': {},
         'omit_create_engine': {'ALL',},
         'to_sql': {
             'method': 'multi',
         },
-        'requirements' : '',
-        'defaults' : {},
+        'requirements': '',
+        'defaults': {},
     },
-    'cockroachdb'      : {
-        'engine'       : 'cockroachdb',
+    'cockroachdb': {
+        'engine': 'cockroachdb',
         'omit_create_engine': {'method',},
         'create_engine': default_create_engine_args,
         'to_sql': {
             'method': 'multi',
         },
-        'requirements' : {'host'},
-        'defaults'     : {
-            'port'     : 26257,
-            'database' : 'defaultdb',
-            'username' : 'root',
-            'password' : 'admin',
+        'requirements': {'host'},
+        'defaults': {
+            'port': 26257,
+            'database': 'defaultdb',
+            'username': 'root',
+            'password': 'admin',
         },
     },
 }

meerschaum/utils/packages/__init__.py

@@ -240,11 +240,11 @@ def manually_import_module(
                 if install:
                     if not pip_install(
                         root_name,
-                        venv = venv,
-                        split = False,
-                        check_update = check_update,
-                        color = color,
-                        debug = debug
+                        venv=venv,
+                        split=False,
+                        check_update=check_update,
+                        color=color,
+                        debug=debug
                     ) and warn:
                         warn_function(
                             f"There's an update available for '{install_name}', "
@@ -252,14 +252,14 @@ def manually_import_module(
                             + "Try installig via Meerschaum with "
                             + "`install packages '{install_name}'`.",
                             ImportWarning,
-                            stacklevel = 3,
-                            color = False,
+                            stacklevel=3,
+                            color=False,
                         )
                 elif warn:
                     warn_function(
                         f"There's an update available for '{root_name}'.",
-                        stack = False,
-                        color = False,
+                        stack=False,
+                        color=False,
                     )
                 spec = (
                     importlib.util.find_spec(import_name)
@@ -267,7 +267,6 @@ def manually_import_module(
                     else importlib.util.spec_from_file_location(import_name, str(mod_path))
                 )
 
-
     if spec is None:
         try:
             mod = _import_module(import_name)
@@ -291,7 +290,7 @@ def manually_import_module(
             sys.modules[import_name] = old_sys_mod
         else:
             del sys.modules[import_name]
-    
+
     return mod
 
 
@@ -497,8 +496,19 @@ def _get_package_metadata(import_name: str, venv: Optional[str]) -> Dict[str, st
         cache_dir_path = VIRTENV_RESOURCES_PATH / venv / 'cache'
         _args += ['--cache-dir', cache_dir_path.as_posix()]
 
+    if use_uv():
+        package_name = 'uv'
+        _args = ['pip', 'show', install_name]
+    else:
+        package_name = 'pip'
+        _args = ['show', install_name]
+
+    print(f"{package_name=}")
+    import traceback
+    traceback.print_stack()
+
     proc = run_python_package(
-        'uv', _args,
+        package_name, _args,
         capture_output=True, as_proc=True, venv=venv, universal_newlines=True,
     )
     outs, errs = proc.communicate()
@@ -515,16 +525,16 @@ def _get_package_metadata(import_name: str, venv: Optional[str]) -> Dict[str, st
 
 
 def need_update(
-        package: Optional['ModuleType'] = None,
-        install_name: Optional[str] = None,
-        import_name: Optional[str] = None,
-        version: Optional[str] = None,
-        check_pypi: bool = False,
-        split: bool = True,
-        color: bool = True,
-        debug: bool = False,
-        _run_determine_version: bool = True,
-    ) -> bool:
+    package: Optional['ModuleType'] = None,
+    install_name: Optional[str] = None,
+    import_name: Optional[str] = None,
+    version: Optional[str] = None,
+    check_pypi: bool = False,
+    split: bool = True,
+    color: bool = True,
+    debug: bool = False,
+    _run_determine_version: bool = True,
+) -> bool:
     """
     Check if a Meerschaum dependency needs an update.
     Returns a bool for whether or not a package needs to be updated.
@@ -749,21 +759,21 @@ def get_pip(
 
 
 def pip_install(
-        *install_names: str,
-        args: Optional[List[str]] = None,
-        requirements_file_path: Union[pathlib.Path, str, None] = None,
-        venv: Optional[str] = 'mrsm',
-        split: bool = False,
-        check_update: bool = True,
-        check_pypi: bool = True,
-        check_wheel: bool = True,
-        _uninstall: bool = False,
-        _from_completely_uninstall: bool = False,
-        _install_uv_pip: bool = True,
-        color: bool = True,
-        silent: bool = False,
-        debug: bool = False,
-    ) -> bool:
+    *install_names: str,
+    args: Optional[List[str]] = None,
+    requirements_file_path: Union[pathlib.Path, str, None] = None,
+    venv: Optional[str] = 'mrsm',
+    split: bool = False,
+    check_update: bool = True,
+    check_pypi: bool = True,
+    check_wheel: bool = True,
+    _uninstall: bool = False,
+    _from_completely_uninstall: bool = False,
+    _install_uv_pip: bool = True,
+    color: bool = True,
+    silent: bool = False,
+    debug: bool = False,
+) -> bool:
     """
     Install packages from PyPI with `pip`.
 
@@ -818,7 +828,6 @@ def pip_install(
     from meerschaum.config import get_config
     from meerschaum.config.static import STATIC_CONFIG
     from meerschaum.utils.warnings import warn
-    from meerschaum.utils.misc import is_android
     if args is None:
         args = ['--upgrade'] if not _uninstall else []
     if color:
@@ -847,7 +856,7 @@ def pip_install(
     except (ImportError, FileNotFoundError):
         uv_bin = None
         have_uv_pip = False
-    if have_pip and not have_uv_pip and _install_uv_pip and not is_android():
+    if have_pip and not have_uv_pip and _install_uv_pip and is_uv_enabled():
         if not pip_install(
             'uv',
             venv=None,
@@ -866,6 +875,7 @@ def pip_install(
         venv_contains_package('uv', venv=None, debug=debug)
         and uv_bin is not None
         and venv is not None
+        and is_uv_enabled()
     )
 
     import sys
@@ -883,7 +893,7 @@ def pip_install(
                 + "https://pip.pypa.io/en/stable/installing/"
             )
             sys.exit(1)
-    
+
     with Venv(venv, debug=debug):
         if venv is not None:
             if (
@@ -909,7 +919,7 @@ def pip_install(
             if not have_wheel:
                 setup_packages_to_install = (
                     ['setuptools', 'wheel']
-                    + ([] if is_android() else ['uv'])
+                    + (['uv'] if is_uv_enabled() else [])
                 )
                 if not pip_install(
                     *setup_packages_to_install,
@@ -1047,10 +1057,10 @@ def get_prerelease_dependencies(_packages: Optional[List[str]] = None):
 
 
 def completely_uninstall_package(
-        install_name: str,
-        venv: str = 'mrsm',
-        debug: bool = False,
-    ) -> bool:
+    install_name: str,
+    venv: str = 'mrsm',
+    debug: bool = False,
+) -> bool:
     """
     Continue calling `pip uninstall` until a package is completely
     removed from a virtual environment. 
@@ -1092,8 +1102,8 @@ def completely_uninstall_package(
 
 
 def pip_uninstall(
-        *args, **kw
-    ) -> bool:
+    *args, **kw
+) -> bool:
     """
     Uninstall Python packages.
     This function is a wrapper around `pip_install()` but with `_uninstall` enforced as `True`.
@@ -1102,16 +1112,16 @@ def pip_uninstall(
 
 
 def run_python_package(
-        package_name: str,
-        args: Optional[List[str]] = None,
-        venv: Optional[str] = 'mrsm',
-        cwd: Optional[str] = None,
-        foreground: bool = False,
-        as_proc: bool = False,
-        capture_output: bool = False,
-        debug: bool = False,
-        **kw: Any,
-    ) -> Union[int, subprocess.Popen, None]:
+    package_name: str,
+    args: Optional[List[str]] = None,
+    venv: Optional[str] = 'mrsm',
+    cwd: Optional[str] = None,
+    foreground: bool = False,
+    as_proc: bool = False,
+    capture_output: bool = False,
+    debug: bool = False,
+    **kw: Any,
+) -> Union[int, subprocess.Popen, None]:
     """
     Runs an installed python package.
     E.g. Translates to `/usr/bin/python -m [package]`
@@ -1172,9 +1182,9 @@ def run_python_package(
     try:
         to_return = run_process(
             command,
-            foreground = foreground,
-            as_proc = as_proc,
-            capture_output = capture_output,
+            foreground=foreground,
+            as_proc=as_proc,
+            capture_output=capture_output,
             **kw
         )
     except Exception as e:
@@ -1187,9 +1197,9 @@ def run_python_package(
         )
         proc = subprocess.Popen(
             command,
-            stdout = stdout,
-            stderr = stderr,
-            env = env_dict,
+            stdout=stdout,
+            stderr=stderr,
+            env=env_dict,
         )
         to_return = proc if as_proc else proc.wait()
     except KeyboardInterrupt:
@@ -1199,20 +1209,20 @@ def run_python_package(
 
 
 def attempt_import(
-        *names: str,
-        lazy: bool = True,
-        warn: bool = True,
-        install: bool = True,
-        venv: Optional[str] = 'mrsm',
-        precheck: bool = True,
-        split: bool = True,
-        check_update: bool = False,
-        check_pypi: bool = False,
-        check_is_installed: bool = True,
-        allow_outside_venv: bool = True,
-        color: bool = True,
-        debug: bool = False
-    ) -> Any:
+    *names: str,
+    lazy: bool = True,
+    warn: bool = True,
+    install: bool = True,
+    venv: Optional[str] = 'mrsm',
+    precheck: bool = True,
+    split: bool = True,
+    check_update: bool = False,
+    check_pypi: bool = False,
+    check_is_installed: bool = True,
+    allow_outside_venv: bool = True,
+    color: bool = True,
+    debug: bool = False
+) -> Any:
     """
     Raise a warning if packages are not installed; otherwise import and return modules.
     If `lazy` is `True`, return lazy-imported modules.
@@ -1399,10 +1409,10 @@ def attempt_import(
 
 
 def lazy_import(
-        name: str,
-        local_name: str = None,
-        **kw
-    ) -> meerschaum.utils.packages.lazy_loader.LazyLoader:
+    name: str,
+    local_name: str = None,
+    **kw
+) -> meerschaum.utils.packages.lazy_loader.LazyLoader:
     """
     Lazily import a package.
     """
@@ -1440,10 +1450,10 @@ def pandas_name() -> str:
 
 emitted_pandas_warning: bool = False
 def import_pandas(
-        debug: bool = False,
-        lazy: bool = False,
-        **kw
-    ) -> 'ModuleType':
+    debug: bool = False,
+    lazy: bool = False,
+    **kw
+) -> 'ModuleType':
     """
     Quality-of-life function to attempt to import the configured version of `pandas`.
     """
@@ -1472,10 +1482,10 @@ def import_pandas(
 
 
 def import_rich(
-        lazy: bool = True,
-        debug: bool = False,
-        **kw : Any
-    ) -> 'ModuleType':
+    lazy: bool = True,
+    debug: bool = False,
+    **kw : Any
+) -> 'ModuleType':
     """
     Quality of life function for importing `rich`.
     """
@@ -1530,13 +1540,13 @@ def import_html(warn=False, **kw) -> 'ModuleType':
 
 
 def get_modules_from_package(
-        package: 'package',
-        names: bool = False,
-        recursive: bool = False,
-        lazy: bool = False,
-        modules_venvs: bool = False,
-        debug: bool = False
-    ):
+    package: 'package',
+    names: bool = False,
+    recursive: bool = False,
+    lazy: bool = False,
+    modules_venvs: bool = False,
+    debug: bool = False
+):
     """
     Find and import all modules in a package.
     
@@ -1585,13 +1595,13 @@ def get_modules_from_package(
 
 
 def import_children(
-        package: Optional['ModuleType'] = None,
-        package_name: Optional[str] = None,
-        types : Optional[List[str]] = None,
-        lazy: bool = True,
-        recursive: bool = False,
-        debug: bool = False
-    ) -> List['ModuleType']:
+    package: Optional['ModuleType'] = None,
+    package_name: Optional[str] = None,
+    types : Optional[List[str]] = None,
+    lazy: bool = True,
+    recursive: bool = False,
+    debug: bool = False
+) -> List['ModuleType']:
     """
     Import all functions in a package to its `__init__`.
 
@@ -1660,12 +1670,12 @@ def import_children(
 
 _reload_module_cache = {}
 def reload_package(
-        package: str,
-        skip_submodules: Optional[List[str]] = None,
-        lazy: bool = False,
-        debug: bool = False,
-        **kw: Any
-    ):
+    package: str,
+    skip_submodules: Optional[List[str]] = None,
+    lazy: bool = False,
+    debug: bool = False,
+    **kw: Any
+):
     """
     Recursively load a package's subpackages, even if they were not previously loaded.
     """
@@ -1724,12 +1734,12 @@ def reload_meerschaum(debug: bool = False) -> SuccessTuple:
 
 
 def is_installed(
-        import_name: str,
-        venv: Optional[str] = 'mrsm',
-        split: bool = True,
-        allow_outside_venv: bool = True,
-        debug: bool = False,
-    ) -> bool:
+    import_name: str,
+    venv: Optional[str] = 'mrsm',
+    split: bool = True,
+    allow_outside_venv: bool = True,
+    debug: bool = False,
+) -> bool:
     """
     Check whether a package is installed.
 
@@ -1782,11 +1792,11 @@ def is_installed(
 
 
 def venv_contains_package(
-        import_name: str,
-        venv: Optional[str] = 'mrsm',
-        split: bool = True,
-        debug: bool = False,
-    ) -> bool:
+    import_name: str,
+    venv: Optional[str] = 'mrsm',
+    split: bool = True,
+    debug: bool = False,
+) -> bool:
     """
     Search the contents of a virtual environment for a package.
     """
@@ -1821,10 +1831,10 @@ def ensure_readline() -> 'ModuleType':
         try:
             rl = attempt_import(
                 rl_name,
-                lazy = False,
-                install = True,
-                venv = None,
-                warn = False,
+                lazy=False,
+                install=True,
+                venv=None,
+                warn=False,
             )
         except (ImportError, ModuleNotFoundError):
             if not pip_install(rl_name, args=['--upgrade', '--ignore-installed'], venv=None):
@@ -1867,9 +1877,51 @@ def _get_pip_os_env(color: bool = True):
     path_sep = ':' if platform.system() != 'Windows' else ';'
     pip_os_env.update({
         'PIP_BREAK_SYSTEM_PACKAGES': 'true',
+        'UV_BREAK_SYSTEM_PACKAGES': 'true',
         ('FORCE_COLOR' if color else 'NO_COLOR'): '1',
     })
     if str(python_bin_path) not in path_str:
         pip_os_env['PATH'] = str(python_bin_path.parent) + path_sep + path_str
 
     return pip_os_env
+
+
+def use_uv() -> bool:
+    """
+    Return whether `uv` is available and enabled.
+    """
+    from meerschaum.utils.misc import is_android
+    if is_android():
+        return False
+
+    if not is_uv_enabled():
+        return False
+
+    try:
+        import uv
+        uv_bin = uv.find_uv_bin()
+    except (ImportError, FileNotFoundError):
+        uv_bin = None
+
+    if uv_bin is None:
+        return False
+
+    return True
+
+
+def is_uv_enabled() -> bool:
+    """
+    Return whether the user has disabled `uv`.
+    """
+    from meerschaum.utils.misc import is_android
+    if is_android():
+        return False
+
+    try:
+        import yaml
+    except ImportError:
+        return False
+
+    from meerschaum.config import get_config
+    enabled = get_config('system', 'experimental', 'uv_pip')
+    return enabled

meerschaum/utils/packages/_packages.py

@@ -39,7 +39,9 @@ packages: Dict[str, Dict[str, str]] = {
         'semver'                     : 'semver>=3.0.0',
         'pathspec'                   : 'pathspec>=0.9.0',
         'dateutil'                   : 'python-dateutil>=2.7.5',
-        'requests'                   : 'requests>=2.23.0',
+        'requests'                   : 'requests>=2.32.3',
+        'certifi'                    : 'certifi>=2024.8.30',
+        'idna'                       : 'idna>=3.10.0',
         'binaryornot'                : 'binaryornot>=0.4.4',
         'pyvim'                      : 'pyvim>=3.0.2',
         'ptpython'                   : 'ptpython>=3.0.27',

meerschaum/utils/venv/__init__.py

@@ -330,11 +330,11 @@ def verify_venv(
 
 tried_virtualenv = False
 def init_venv(
-        venv: str = 'mrsm',
-        verify: bool = True,
-        force: bool = False,
-        debug: bool = False,
-    ) -> bool:
+    venv: str = 'mrsm',
+    verify: bool = True,
+    force: bool = False,
+    debug: bool = False,
+) -> bool:
     """
     Initialize the virtual environment.
 
@@ -366,6 +366,7 @@ def init_venv(
     import sys, platform, os, pathlib, shutil
     from meerschaum.config.static import STATIC_CONFIG
     from meerschaum.config._paths import VIRTENV_RESOURCES_PATH
+    from meerschaum.utils.packages import is_uv_enabled
     venv_path = VIRTENV_RESOURCES_PATH / venv
     docker_home_venv_path = pathlib.Path('/home/meerschaum/venvs/mrsm')
 
@@ -387,7 +388,7 @@ def init_venv(
     global tried_virtualenv
     try:
         import venv as _venv
-        uv = attempt_import('uv', venv=None, debug=debug)
+        uv = attempt_import('uv', venv=None, debug=debug) if is_uv_enabled() else None
         virtualenv = None
     except ImportError:
         _venv = None
@@ -400,9 +401,9 @@ def init_venv(
         _venv_success = run_python_package(
             'uv',
             ['venv', venv_path.as_posix(), '-q'],
-            venv = None,
-            env = _get_pip_os_env(),
-            debug = debug,
+            venv=None,
+            env=_get_pip_os_env(),
+            debug=debug,
         ) == 0
 
     if _venv is not None and not _venv_success:

{meerschaum-2.4.1.dist-info → meerschaum-2.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.4.1
+Version: 2.4.2
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -66,7 +66,9 @@ Requires-Dist: update-checker >=0.18.0 ; extra == 'api'
 Requires-Dist: semver >=3.0.0 ; extra == 'api'
 Requires-Dist: pathspec >=0.9.0 ; extra == 'api'
 Requires-Dist: python-dateutil >=2.7.5 ; extra == 'api'
-Requires-Dist: requests >=2.23.0 ; extra == 'api'
+Requires-Dist: requests >=2.32.3 ; extra == 'api'
+Requires-Dist: certifi >=2024.8.30 ; extra == 'api'
+Requires-Dist: idna >=3.10.0 ; extra == 'api'
 Requires-Dist: binaryornot >=0.4.4 ; extra == 'api'
 Requires-Dist: pyvim >=3.0.2 ; extra == 'api'
 Requires-Dist: ptpython >=3.0.27 ; extra == 'api'
@@ -117,7 +119,9 @@ Requires-Dist: update-checker >=0.18.0 ; extra == 'core'
 Requires-Dist: semver >=3.0.0 ; extra == 'core'
 Requires-Dist: pathspec >=0.9.0 ; extra == 'core'
 Requires-Dist: python-dateutil >=2.7.5 ; extra == 'core'
-Requires-Dist: requests >=2.23.0 ; extra == 'core'
+Requires-Dist: requests >=2.32.3 ; extra == 'core'
+Requires-Dist: certifi >=2024.8.30 ; extra == 'core'
+Requires-Dist: idna >=3.10.0 ; extra == 'core'
 Requires-Dist: binaryornot >=0.4.4 ; extra == 'core'
 Requires-Dist: pyvim >=3.0.2 ; extra == 'core'
 Requires-Dist: ptpython >=3.0.27 ; extra == 'core'
@@ -201,7 +205,9 @@ Requires-Dist: update-checker >=0.18.0 ; extra == 'full'
 Requires-Dist: semver >=3.0.0 ; extra == 'full'
 Requires-Dist: pathspec >=0.9.0 ; extra == 'full'
 Requires-Dist: python-dateutil >=2.7.5 ; extra == 'full'
-Requires-Dist: requests >=2.23.0 ; extra == 'full'
+Requires-Dist: requests >=2.32.3 ; extra == 'full'
+Requires-Dist: certifi >=2024.8.30 ; extra == 'full'
+Requires-Dist: idna >=3.10.0 ; extra == 'full'
 Requires-Dist: binaryornot >=0.4.4 ; extra == 'full'
 Requires-Dist: pyvim >=3.0.2 ; extra == 'full'
 Requires-Dist: ptpython >=3.0.27 ; extra == 'full'
@@ -293,7 +299,9 @@ Requires-Dist: update-checker >=0.18.0 ; extra == 'sql'
 Requires-Dist: semver >=3.0.0 ; extra == 'sql'
 Requires-Dist: pathspec >=0.9.0 ; extra == 'sql'
 Requires-Dist: python-dateutil >=2.7.5 ; extra == 'sql'
-Requires-Dist: requests >=2.23.0 ; extra == 'sql'
+Requires-Dist: requests >=2.32.3 ; extra == 'sql'
+Requires-Dist: certifi >=2024.8.30 ; extra == 'sql'
+Requires-Dist: idna >=3.10.0 ; extra == 'sql'
 Requires-Dist: binaryornot >=0.4.4 ; extra == 'sql'
 Requires-Dist: pyvim >=3.0.2 ; extra == 'sql'
 Requires-Dist: ptpython >=3.0.27 ; extra == 'sql'

{meerschaum-2.4.1.dist-info → meerschaum-2.4.2.dist-info}/RECORD

@@ -24,7 +24,7 @@ meerschaum/_internal/term/tools.py,sha256=dXVAimKD-Yv2fg2WOTr0YGBY7XDKjQqw-RizcS
 meerschaum/actions/__init__.py,sha256=MHPs8aRBhbZQXnqd_6tVtisTrNCgPAPgnNcXYbn0zP8,11640
 meerschaum/actions/api.py,sha256=xeqkf4S-DEzFR8roIF1mzy-i_mAnUPkF7y3nIu8twCo,12593
 meerschaum/actions/attach.py,sha256=UV19d9W_2WYcrf7BRz7k3mriDoX1V4rA4AKvbLdor0o,3106
-meerschaum/actions/bootstrap.py,sha256=X2YpYcxDR1vijj4YlJcdmErnt2FpF2s_tgyHVjpvISc,14916
+meerschaum/actions/bootstrap.py,sha256=z6Wmx9EDKr5gfyMyMmyiTf_oVDASdcgChkKyzHYPOmQ,14924
 meerschaum/actions/clear.py,sha256=OoFZE0bK5m8s3GLNZcixuVT0DMj1izXVxGCATcmUGbI,4851
 meerschaum/actions/copy.py,sha256=NwTwj3IMdK1TFRuJXCxsbIEFNVeoNGoMkvE6H1ZQZzo,6838
 meerschaum/actions/deduplicate.py,sha256=puYyxeFYEUy1Sd2IOcZB2e6MrNxAZl2bTLmNzFDkCiw,1167
@@ -129,7 +129,7 @@ meerschaum/api/routes/_users.py,sha256=SfAkZFKrKnGjpzj8SFIKzPemzQJOH3oB72h19EaUv
 meerschaum/api/routes/_version.py,sha256=2t-nw_9IxCVZCNEar0LOwmut2zsClRVHjiOOUx16cu0,825
 meerschaum/api/routes/_webterm.py,sha256=twjQyVReYwXypvxLPICYWjB5hR-XHzUWEuYRbSq27nc,3834
 meerschaum/api/tables/__init__.py,sha256=e2aNC0CdlWICTUMx1i9RauF8Pm426J0RZJbsJWv4SWo,482
-meerschaum/config/__init__.py,sha256=jZgQSjvbOWyvGouqRgIeYBg9Pp343_9CDsCWWpwYDGY,11577
+meerschaum/config/__init__.py,sha256=5ZBq71P9t3nb74r5CGvMfNuauPscfegBX-nkaAUi5C4,11541
 meerschaum/config/_dash.py,sha256=BJHl4xMrQB-YHUEU7ldEW8q_nOPoIRSOqLrfGElc6Dw,187
 meerschaum/config/_default.py,sha256=gGkF9dGiwiKtMSXAE85LNhZ8ZXQ5EbeBPTSG0A9MBNQ,5675
 meerschaum/config/_edit.py,sha256=_kabgFbJdI5kcLs-JIsoaTo0JdyxnPnBdrlTyTAgPm8,8236
@@ -139,13 +139,13 @@ meerschaum/config/_jobs.py,sha256=gS_4mMGdmVP7WB4V5Sz8kYP0HmhWcMY2jSWGR7jX6cw,12
 meerschaum/config/_patch.py,sha256=21N30q1ANmWMDQ-2RUjpMx7KafWfPQ3lKx9rrMqg1s4,1526
 meerschaum/config/_paths.py,sha256=Ycuj4TYTzXO-6JkWX40fMK0CVV6L5HG_rPlCi-Ckhto,9763
 meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6wLs,1220
-meerschaum/config/_read_config.py,sha256=WFZKIXZMDe_ca0ES7ivgM_mnwShvFxLdoeisT_X5-h0,14720
+meerschaum/config/_read_config.py,sha256=oxnLjuhy6JBBld886FkBX07wUdkpzEzTItYMUa9qw1Q,14688
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
-meerschaum/config/_sync.py,sha256=oK2ZujO2T1he08BXCFyiniBUevNGWSQKXLcS_jRv_7Y,4155
-meerschaum/config/_version.py,sha256=MWDIPuVPrx0N5vxzIOy58EultrUEFqxSmbIAnQtAUAo,71
+meerschaum/config/_sync.py,sha256=jHcWRkxd82_BgX8Xo8agsWvf7BSbv3qHLWmYl6ehp_0,4242
+meerschaum/config/_version.py,sha256=gEdmihoOiv3_8gcV8s_UNuiav3ge2HDCUUdRpRT0lFI,71
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meerschaum/config/stack/__init__.py,sha256=jHnk1HE7riEVOFbt0SHgTM7kmrdRVic1raQSs220wn0,10550
+meerschaum/config/stack/__init__.py,sha256=gGVxXgNnGb9u25iF__IiNPlZt1BLUVmHmFJ0jvnJg3Q,10548
 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
@@ -155,7 +155,7 @@ meerschaum/connectors/_Connector.py,sha256=VaVNg0SlQCTXk4shl3c68QdkbymA2Y9ScUlUj
 meerschaum/connectors/__init__.py,sha256=bpWsnU0uvoowWyUkFTwfEkadK84pssZUJ4M7yReudOU,12703
 meerschaum/connectors/parse.py,sha256=tnqzkzt_suOXYzktn_XVUrprtfym9ThijUf8HXZZlhY,4194
 meerschaum/connectors/poll.py,sha256=23yRUeIqqyNVt8VoJErhirW543YZ6X0ocfBauMJnC_g,7465
-meerschaum/connectors/api/_APIConnector.py,sha256=lUsyAf0b-k6X25501FAJQiWX395Vf86MYSaRM4np2h0,5070
+meerschaum/connectors/api/_APIConnector.py,sha256=Cujs8FDsvaxEV4mnnuft5zjvjiuhM5DybOZtfd8-YJI,5142
 meerschaum/connectors/api/__init__.py,sha256=rYHDMK7n-5X5HoxiRITt-sVLgePnPQbgwntkhzvJvOk,234
 meerschaum/connectors/api/_actions.py,sha256=gd3F8i5BvN8XRvMcPvPVR8sc1DeLzgoBHdDhc8PtACE,3966
 meerschaum/connectors/api/_fetch.py,sha256=Khq9AFr1nk8Dsmcedb77aWhAuHw0JGgVeahDG95Q5MQ,2072
@@ -172,7 +172,7 @@ meerschaum/connectors/plugin/__init__.py,sha256=pwF7TGY4WNz2_HaVdmK4rPQ9ZwTOEuPH
 meerschaum/connectors/sql/_SQLConnector.py,sha256=QvsFgAv2NAUdsJrcNYZIkQ9x_ow5JRe4Ie_UgSrDz3M,11709
 meerschaum/connectors/sql/__init__.py,sha256=3cqYiDkVasn7zWdtOTAZbT4bo95AuvGOmDD2TkaAxtw,205
 meerschaum/connectors/sql/_cli.py,sha256=1SgnWeMIAihoxp4FzbNrcq1npXf0dSOQnCntpU9hUXA,4405
-meerschaum/connectors/sql/_create_engine.py,sha256=vPVwR3cpfcQm0aW9xo_DUWA3gMdlkuB0wJ8JoTpRYD0,10396
+meerschaum/connectors/sql/_create_engine.py,sha256=ulKtML7e5p0Me0pHKVVSEd9WF8UI9sdEPuk-6t4REpo,10068
 meerschaum/connectors/sql/_fetch.py,sha256=NYYWDoEd-aGIS337KwH-D9_3KVWVCZOHAspGLfdEuUE,13086
 meerschaum/connectors/sql/_instance.py,sha256=r_S96vzSuKnBVGROSKQAPl-DnFnOOEPUkz1KFDFPHFQ,6509
 meerschaum/connectors/sql/_pipes.py,sha256=cVdc929CIjyPPzM_QNVEkNfvROrksakEifgqJbm6jH0,99622
@@ -245,16 +245,16 @@ meerschaum/utils/formatting/_jobs.py,sha256=izsqPJhTtUkXUUtWnbXtReYsUYwulXtci3pB
 meerschaum/utils/formatting/_pipes.py,sha256=wy0iWJFsFl3X2VloaiA_gp9Yx9w6tD3FQZvAQAqef4A,19492
 meerschaum/utils/formatting/_pprint.py,sha256=tgrT3FyGyu5CWJYysqK3kX1xdZYorlbOk9fcU_vt9Qg,3096
 meerschaum/utils/formatting/_shell.py,sha256=OMFh3cSZNr83z8m265irkS_JtEWHwjkEY2ybnMIOllY,3774
-meerschaum/utils/packages/__init__.py,sha256=aByhWPf4H7yilmSkEP4Qa0IXsZv6Aq1l19b40QydvG4,63393
-meerschaum/utils/packages/_packages.py,sha256=987HQ1SnjGh2r4Gp8pziX7VUzUHm-tM_g2oYsDdLfpM,8149
+meerschaum/utils/packages/__init__.py,sha256=ZWOa9zR7rwmX_5f7MNe2vEbX0GiG-Bo_1W6pdVxHKxU,64045
+meerschaum/utils/packages/_packages.py,sha256=kwXoGePzmaNVRB5YQP6JJOWQqnPiUpM-TPtb38DrPXg,8265
 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=bLAWnllKDuE_z6bLk7gLh4mI3Sp1j5hsboTqPKOQq84,24361
-meerschaum-2.4.1.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.4.1.dist-info/METADATA,sha256=akMpC-0UIHkMfPhDD1FqFnlWqTD3AXae8OtWtWJRyyc,24287
-meerschaum-2.4.1.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.4.1.dist-info/WHEEL,sha256=5Mi1sN9lKoFv_gxcPtisEVrJZihrm_beibeg5R6xb4I,91
-meerschaum-2.4.1.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.4.1.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.4.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.4.1.dist-info/RECORD,,
+meerschaum/utils/venv/__init__.py,sha256=G3KXL4ByWNqVxBRLs_RaJbO3h3tOKXkazkAYuoUW568,24420
+meerschaum-2.4.2.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.4.2.dist-info/METADATA,sha256=Q38pjxkuUYk8AVaVM2VpmCgeIpr1VnQeA5q3wCLO0Vo,24683
+meerschaum-2.4.2.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.4.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+meerschaum-2.4.2.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.4.2.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.4.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.4.2.dist-info/RECORD,,

{meerschaum-2.4.1.dist-info → meerschaum-2.4.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.0.0)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any