meerschaum 2.2.2rc5__py3-none-any.whl → 2.2.4__py3-none-any.whl

meerschaum/_internal/term/__init__.py

@@ -32,7 +32,7 @@ def get_webterm_app_and_manager() -> Tuple[
     A tuple of the Tornado web application and term manager.
     """
     commands = [
-        venv_executable('mrsm'),
+        venv_executable(None),
         '-c',
         "import os; _ = os.environ.pop('COLUMNS', None); _ = os.environ.pop('LINES', None); "
         "from meerschaum._internal.entry import get_shell; "

meerschaum/actions/api.py

@@ -156,7 +156,6 @@ def _api_start(
     from meerschaum.config.static import STATIC_CONFIG, SERVER_ID
     from meerschaum.connectors.parse import parse_instance_keys
     from meerschaum.utils.pool import get_pool
-    from meerschaum.utils.venv import get_module_venv
     import shutil
     from copy import deepcopy
 
@@ -170,10 +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',
-        lazy = False,
-        check_update = False,
-        venv = 'mrsm',
+        'uvicorn', 'gunicorn', venv=None, lazy=False, check_update=False,
     )
 
     uvicorn_config_path = API_UVICORN_RESOURCES_PATH / SERVER_ID / 'config.json'
@@ -309,51 +305,19 @@ def _api_start(
     ### remove custom keys before calling uvicorn
 
     def _run_uvicorn():
-        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']
-        run_python_package(
-            'uvicorn',
-            uvicorn_args,
-            venv = get_module_venv(uvicorn),
-            as_proc = False,
-            foreground = True,
-            debug = debug,
-        )
+        try:
+            uvicorn.run(
+                **filter_keywords(
+                    uvicorn.run,
+                    **{
+                        k: v
+                        for k, v in uvicorn_config.items()
+                        if k not in custom_keys
+                    }
+                )
+            )
+        except KeyboardInterrupt:
+            pass
 
     def _run_gunicorn():
         gunicorn_args = [
@@ -374,21 +338,23 @@ def _api_start(
             ]
         if debug:
             gunicorn_args += ['--log-level=debug', '--enable-stdio-inheritance', '--reload']
-
-        run_python_package(
-            'gunicorn',
-            gunicorn_args,
-            env = {
-                k: (
-                    json.dumps(v)
-                    if isinstance(v, (dict, list))
-                    else v
-                )
-                for k, v in env_dict.items()
-            },
-            venv = get_module_venv(gunicorn),
-            debug = debug,
-        )
+        try:
+            run_python_package(
+                'gunicorn',
+                gunicorn_args,
+                env = {
+                    k: (
+                        json.dumps(v)
+                        if isinstance(v, (dict, list))
+                        else v
+                    )
+                    for k, v in env_dict.items()
+                },
+                venv = None,
+                debug = debug,
+            )
+        except KeyboardInterrupt:
+            pass
 
 
     _run_uvicorn() if not production else _run_gunicorn()

meerschaum/actions/python.py

@@ -10,7 +10,6 @@ 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
@@ -24,8 +23,7 @@ def python(
     
     Examples:
         mrsm python
-        mrsm python --venv noaa
-        mrsm python [-i] [-c 'print("hi")']
+        mrsm python [-m pip -V]
     """
     import sys, subprocess, os
     from meerschaum.utils.debug import dprint
@@ -39,9 +37,6 @@ def python(
     if action is None:
         action = []
 
-    if venv == 'None':
-        venv = None
-
     joined_actions = ["import meerschaum as mrsm"]
     line = ""
     for i, a in enumerate(action):
@@ -88,19 +83,13 @@ def python(
     with open(init_script_path, 'w', encoding='utf-8') as f:
         f.write(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()})
-
     try:
-        ptpython = attempt_import('ptpython', venv=venv, allow_outside_venv=False)
+        ptpython = attempt_import('ptpython', venv=None)
         return_code = run_python_package(
             'ptpython',
             sub_args or ['--dark-bg', '-i', init_script_path.as_posix()],
-            venv = venv,
             foreground = True,
-            env = env_dict,
+            venv = None,
         )
     except KeyboardInterrupt:
         return_code = 1

meerschaum/config/_version.py

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

meerschaum/utils/packages/_packages.py

@@ -74,6 +74,7 @@ packages: Dict[str, Dict[str, str]] = {
         'litecli'                    : 'litecli>=1.5.0',
         'mssqlcli'                   : 'mssql-cli>=1.0.0',
         'gadwall'                    : 'gadwall>=0.2.0',
+        'ptpython'                   : 'ptpython>=3.0.27',
     },
     'stack': {
         'compose'                    : 'docker-compose>=1.29.2',

{meerschaum-2.2.2rc5.dist-info → meerschaum-2.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.2rc5
+Version: 2.2.4
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -105,6 +105,7 @@ Requires-Dist: mycli >=1.23.2 ; extra == 'cli'
 Requires-Dist: litecli >=1.5.0 ; extra == 'cli'
 Requires-Dist: mssql-cli >=1.0.0 ; extra == 'cli'
 Requires-Dist: gadwall >=0.2.0 ; extra == 'cli'
+Requires-Dist: ptpython >=3.0.27 ; extra == 'cli'
 Provides-Extra: core
 Requires-Dist: wheel >=0.34.2 ; extra == 'core'
 Requires-Dist: setuptools >=63.3.0 ; extra == 'core'

{meerschaum-2.2.2rc5.dist-info → meerschaum-2.2.4.dist-info}/RECORD

@@ -18,10 +18,10 @@ meerschaum/_internal/shell/ValidAutoSuggest.py,sha256=bARjOWMidz0dvMelLUe6yRPto5
 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=c4Je3376Tj7Me2qldCxg_Xs2mGN-Mu1YAMIaAG6vK6w,1642
+meerschaum/_internal/term/__init__.py,sha256=LqTySBfHYnOtHGYCWfovcxV4FnZdON2BPYp0UbgI1QI,1640
 meerschaum/_internal/term/tools.py,sha256=dXVAimKD-Yv2fg2WOTr0YGBY7XDKjQqw-RizcS65YVI,727
 meerschaum/actions/__init__.py,sha256=7CNoKEqkqqafqMcChspJX9cR9OdgEWk9ggj0000Jl98,11360
-meerschaum/actions/api.py,sha256=7OTGfcu7CmOqplYJBdk3vCIFMPE_8QkEGRS_B-Ow9V0,14031
+meerschaum/actions/api.py,sha256=mWhv4bn3Ap17_Gqf2Cx9bAsHKG-Zhy072pBbNzHLEJc,12756
 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=ELGeOI6CZXHtweVN-x1jENYdGipj1Nd4_oPAKQX5nvc,3680
+meerschaum/actions/python.py,sha256=Ogqm9NFFq3E710mRWAAU7F8JiEHrxYcGKj5H3ZDsP-s,3295
 meerschaum/actions/register.py,sha256=l_21LWZCzKwJVex_xAXECC5WVW1VEuIX9HSp7CuyCwA,11326
 meerschaum/actions/reload.py,sha256=gMXeFBGVfyQ7uhKhYf6bLaDMD0fLPcA9BrLBSiuvWIc,508
 meerschaum/actions/setup.py,sha256=KkAGWcgwzl_L6A19fTmTX1KtBjW2FwD8QenLjPy0mQQ,3205
@@ -136,7 +136,7 @@ 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=s74cmJl8NrhM_Y1cB_P41_JDUYXV0g4WXnKFZWMtnrY,3551
 meerschaum/config/_sync.py,sha256=oK2ZujO2T1he08BXCFyiniBUevNGWSQKXLcS_jRv_7Y,4155
-meerschaum/config/_version.py,sha256=R4_ZNT4X6qLOQklao3FqRwhR3CdlVM9zUuRCP3yTKOo,74
+meerschaum/config/_version.py,sha256=tzwD6PP0EAlINX0JJN0MPxAdg_vH8JKm0JxuSFEgJ_A,71
 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
@@ -226,15 +226,15 @@ meerschaum/utils/formatting/_pipes.py,sha256=wy0iWJFsFl3X2VloaiA_gp9Yx9w6tD3FQZv
 meerschaum/utils/formatting/_pprint.py,sha256=tgrT3FyGyu5CWJYysqK3kX1xdZYorlbOk9fcU_vt9Qg,3096
 meerschaum/utils/formatting/_shell.py,sha256=ox75O7VHDAiwzSvdMSJZhXLadvAqYJVeihU6WeZ2Ogc,3677
 meerschaum/utils/packages/__init__.py,sha256=6zRX0g8Kh-wHjvkbiMf_kLKM2BlR5FJUCA3JStX9YeU,62628
-meerschaum/utils/packages/_packages.py,sha256=kWoo1KWvpQgR3rY_rpHzvGIh14BBFH92Erw5UtW7yX0,7918
+meerschaum/utils/packages/_packages.py,sha256=yU8bD4fYs4cv1gOtEp3QrnejyvPi0K2W9TYaP_cd59w,7977
 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=4vFAu85lQ5GYEVhc6e_KhFmrks4t_Ma6ysmtraccYbs,24187
-meerschaum-2.2.2rc5.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.2.2rc5.dist-info/METADATA,sha256=QhNzdZU70RmUk8k7ev7HIllCV1ewQl2i_eYK1G9Ey8s,23988
-meerschaum-2.2.2rc5.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.2.2rc5.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-meerschaum-2.2.2rc5.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.2.2rc5.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.2.2rc5.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.2.2rc5.dist-info/RECORD,,
+meerschaum-2.2.4.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.2.4.dist-info/METADATA,sha256=qA6ciSqJ8o1Cfsl2Al74zn3a7NS1wzsteaim54kRDIQ,24035
+meerschaum-2.2.4.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.2.4.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+meerschaum-2.2.4.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.2.4.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.2.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.2.4.dist-info/RECORD,,