meerschaum 2.4.1__tar.gz → 2.4.3__tar.gz

{meerschaum-2.4.1/meerschaum.egg-info → meerschaum-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.4.1
+Version: 2.4.3
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -51,7 +51,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"
@@ -147,7 +149,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"
@@ -204,7 +208,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"
@@ -254,7 +260,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"

{meerschaum-2.4.1 → meerschaum-2.4.3}/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-2.4.1 → meerschaum-2.4.3}/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-2.4.1 → meerschaum-2.4.3}/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-2.4.1 → meerschaum-2.4.3}/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-2.4.1 → meerschaum-2.4.3}/meerschaum/config/_version.py

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

{meerschaum-2.4.1 → meerschaum-2.4.3}/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-2.4.1 → meerschaum-2.4.3}/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-2.4.1 → meerschaum-2.4.3}/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 18 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',
         },
     },
 }