meerschaum 2.1.7__py3-none-any.whl → 2.2.0.dev2__py3-none-any.whl

meerschaum/config/_version.py

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

meerschaum/config/stack/__init__.py

@@ -97,7 +97,6 @@ compose_header = """
 
 
 default_docker_compose_config = {
-    'version': '3.9',
     'services': {
         'db': {
             'environment': {

meerschaum/connectors/api/_plugins.py

@@ -49,6 +49,7 @@ def register_plugin(
 def install_plugin(
         self,
         name: str,
+        skip_deps: bool = False,
         force: bool = False,
         debug: bool = False
     ) -> SuccessTuple:
@@ -78,7 +79,7 @@ def install_plugin(
             success, msg = False, fail_msg
         return success, msg
     plugin = Plugin(name, archive_path=archive_path, repo_connector=self)
-    return plugin.install(force=force, debug=debug)
+    return plugin.install(skip_deps=skip_deps, force=force, debug=debug)
 
 def get_plugins(
         self,

meerschaum/connectors/sql/_create_engine.py

@@ -154,10 +154,10 @@ install_flavor_drivers = {
     'duckdb': ['duckdb', 'duckdb_engine'],
     'mysql': ['pymysql'],
     'mariadb': ['pymysql'],
-    'timescaledb': ['psycopg2'],
-    'postgresql': ['psycopg2'],
-    'citus': ['psycopg2'],
-    'cockroachdb': ['psycopg2', 'sqlalchemy_cockroachdb', 'sqlalchemy_cockroachdb.psycopg2'],
+    'timescaledb': ['psycopg'],
+    'postgresql': ['psycopg'],
+    'citus': ['psycopg'],
+    'cockroachdb': ['psycopg', 'sqlalchemy_cockroachdb', 'sqlalchemy_cockroachdb.psycopg'],
     'mssql': ['pyodbc'],
     'oracle': ['cx_Oracle'],
 }
@@ -165,7 +165,7 @@ require_patching_flavors = {'cockroachdb': [('sqlalchemy-cockroachdb', 'sqlalche
 
 flavor_dialects = {
     'cockroachdb': (
-        'cockroachdb', 'sqlalchemy_cockroachdb.psycopg2', 'CockroachDBDialect_psycopg2'
+        'cockroachdb', 'sqlalchemy_cockroachdb.psycopg', 'CockroachDBDialect_psycopg'
     ),
     'duckdb': ('duckdb', 'duckdb_engine', 'Dialect'),
 }

meerschaum/plugins/_Plugin.py

@@ -252,6 +252,7 @@ class Plugin:
 
     def install(
             self,
+            skip_deps: bool = False,
             force: bool = False,
             debug: bool = False,
         ) -> SuccessTuple:
@@ -263,6 +264,9 @@ class Plugin:
 
         Parameters
         ----------
+        skip_deps: bool, default False
+            If `True`, do not install dependencies.
+
         force: bool, default False
             If `True`, continue with installation, even if required packages fail to install.
 
@@ -366,7 +370,11 @@ class Plugin:
                 plugin_installation_dir_path = path
                 break
 
-        success_msg = f"Successfully installed plugin '{self}'."
+        success_msg = (
+            f"Successfully installed plugin '{self}'"
+            + ("\n    (skipped dependencies)" if skip_deps else "")
+            + "."
+        )
         success, abort = None, None
 
         if is_same_version and not force:
@@ -423,7 +431,8 @@ class Plugin:
             return success, msg
 
         ### attempt to install dependencies
-        if not self.install_dependencies(force=force, debug=debug):
+        dependencies_installed = skip_deps or self.install_dependencies(force=force, debug=debug)
+        if not dependencies_installed:
             _ongoing_installations.remove(self.full_name)
             return False, f"Failed to install dependencies for plugin '{self}'."
 

meerschaum/utils/daemon/Daemon.py

@@ -865,21 +865,29 @@ class Daemon:
             error(_write_pickle_success_tuple[1])
 
 
-    def cleanup(self, keep_logs: bool = False) -> None:
-        """Remove a daemon's directory after execution.
+    def cleanup(self, keep_logs: bool = False) -> SuccessTuple:
+        """
+        Remove a daemon's directory after execution.
 
         Parameters
         ----------
         keep_logs: bool, default False
             If `True`, skip deleting the daemon's log files.
+
+        Returns
+        -------
+        A `SuccessTuple` indicating success.
         """
         if self.path.exists():
             try:
                 shutil.rmtree(self.path)
             except Exception as e:
-                warn(e)
+                msg = f"Failed to clean up '{self.daemon_id}':\n{e}"
+                warn(msg)
+                return False, msg
         if not keep_logs:
             self.rotating_log.delete()
+        return True, "Success"
 
 
     def get_timeout_seconds(self, timeout: Union[int, float, None] = None) -> Union[int, float]:

meerschaum/utils/dtypes/__init__.py

@@ -6,8 +6,10 @@
 Utility functions for working with data types.
 """
 
+import traceback
 from decimal import Decimal, Context, InvalidOperation
 from meerschaum.utils.typing import Dict, Union, Any
+from meerschaum.utils.warnings import warn
 
 MRSM_PD_DTYPES: Dict[str, str] = {
     'json': 'object',
@@ -37,9 +39,7 @@ def to_pandas_dtype(dtype: str) -> str:
         from meerschaum.utils.dtypes.sql import get_pd_type_from_db_type
         return get_pd_type_from_db_type(dtype)
 
-    import traceback
     from meerschaum.utils.packages import attempt_import
-    from meerschaum.utils.warnings import warn
     pandas = attempt_import('pandas', lazy=False)
 
     try:
@@ -88,8 +88,12 @@ def are_dtypes_equal(
                 return False
         return True
 
-    if ldtype == rdtype:
-        return True
+    try:
+        if ldtype == rdtype:
+            return True
+    except Exception as e:
+        warn(f"Exception when comparing dtypes, returning False:\n{traceback.format_exc()}")
+        return False
 
     ### Sometimes pandas dtype objects are passed.
     ldtype = str(ldtype)
@@ -177,7 +181,7 @@ def attempt_cast_to_numeric(value: Any) -> Any:
         return value
 
 
-def value_is_null(value: Any) -> Any:
+def value_is_null(value: Any) -> bool:
     """
     Determine if a value is a null-like string.
     """

meerschaum/utils/packages/__init__.py

@@ -8,7 +8,7 @@ Functions for managing packages and virtual environments reside here.
 
 from __future__ import annotations
 
-import importlib.util, os, pathlib
+import importlib.util, os, pathlib, re
 from meerschaum.utils.typing import Any, List, SuccessTuple, Optional, Union, Tuple, Dict, Iterable
 from meerschaum.utils.threading import Lock, RLock
 from meerschaum.utils.packages._packages import packages, all_packages, get_install_names
@@ -640,6 +640,9 @@ def need_update(
 
     ### We might be depending on a prerelease.
     ### Sanity check that the required version is not greater than the installed version. 
+    if 'a' in required_version:
+        required_version = required_version.replace('a', '-dev')
+        version = version.replace('a', '-dev')
     try:
         return (
             (not semver.Version.parse(version).match(required_version))

meerschaum/utils/packages/_packages.py

@@ -52,11 +52,11 @@ packages: Dict[str, Dict[str, str]] = {
         'watchgod'                   : 'watchgod>=0.7.0',
         'dill'                       : 'dill>=0.3.3',
         'virtualenv'                 : 'virtualenv>=20.1.0',
-        'rocketry'                   : 'rocketry>=2.5.1',
+        'apscheduler'                : 'apscheduler>=4.0.0a4',
     },
     'drivers': {
         'cryptography'               : 'cryptography>=38.0.1',
-        'psycopg2'                   : 'psycopg2-binary>=2.8.6',
+        'psycopg'                    : 'psycopg[binary]>=3.1.18',
         'pymysql'                    : 'PyMySQL>=0.9.0',
         'aiomysql'                   : 'aiomysql>=0.0.21',
         'sqlalchemy_cockroachdb'     : 'sqlalchemy-cockroachdb>=2.0.0',
@@ -75,11 +75,11 @@ packages: Dict[str, Dict[str, str]] = {
         'gadwall'                    : 'gadwall>=0.2.0',
     },
     'stack': {
-        'compose'                    : 'docker-compose>=1.27.4',
+        'compose'                    : 'docker-compose>=1.29.2',
     },
     'build': {
-        'cx_Freeze'                  : 'cx_Freeze>=6.5.1',
-        'PyInstaller'                : 'pyinstaller>=5.0.0-dev0',
+        'cx_Freeze'                  : 'cx_Freeze>=7.0.0',
+        'PyInstaller'                : 'pyinstaller>6.6.0',
     },
     'dev-tools': {
         'twine'                      : 'twine>=3.2.0',
@@ -149,7 +149,7 @@ packages['api'] = {
     'passlib'                        : 'passlib>=1.7.4',
     'fastapi_login'                  : 'fastapi-login>=1.7.2',
     'multipart'                      : 'python-multipart>=0.0.5',
-    'pydantic'                       : 'pydantic<2.0.0',
+    #  'pydantic'                       : 'pydantic>2.0.0',
     'httpx'                          : 'httpx>=0.24.1',
     'websockets'                     : 'websockets>=11.0.3',
 }

meerschaum/utils/schedule.py

@@ -7,11 +7,69 @@ Schedule processes and threads.
 """
 
 from __future__ import annotations
-from meerschaum.utils.typing import Callable, Any, Optional
+import sys
+from datetime import datetime, timezone, timedelta, timedelta
+import meerschaum as mrsm
+from meerschaum.utils.typing import Callable, Any, Optional, List, Dict
+
+INTERVAL_UNITS: List[str] = ['months', 'weeks', 'days', 'hours', 'minutes', 'seconds']
+FREQUENCY_ALIASES: Dict[str, str] = {
+    'daily': 'every 1 day',
+    'hourly': 'every 1 hour',
+    'minutely': 'every 1 minute',
+    'weekly': 'every 1 week',
+    'monthly': 'every 1 month',
+    'secondly': 'every 1 second',
+}
+LOGIC_ALIASES: Dict[str, str] = {
+    'and': '&',
+    'or': '|',
+    ' through ': '-',
+    ' thru ': '-',
+    ' - ': '-',
+    'beginning': 'starting',
+}
+CRON_DAYS_OF_WEEK: List[str] = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
+CRON_DAYS_OF_WEEK_ALIASES: Dict[str, str] = {
+    'monday': 'mon',
+    'tuesday': 'tue',
+    'tues': 'tue',
+    'wednesday': 'wed',
+    'thursday': 'thu',
+    'thurs': 'thu',
+    'friday': 'fri',
+    'saturday': 'sat',
+    'sunday': 'sun',
+}
+CRON_MONTHS: List[str] = [
+    'jan', 'feb', 'mar', 'apr', 'may', 'jun',
+    'jul', 'aug', 'sep', 'oct', 'nov', 'dec',
+]
+CRON_MONTHS_ALIASES: Dict[str, str] = {
+    'january': 'jan',
+    'february': 'feb',
+    'march': 'mar',
+    'april': 'apr',
+    'may': 'may',
+    'june': 'jun',
+    'july': 'jul',
+    'august': 'aug',
+    'september': 'sep',
+    'october': 'oct',
+    'november': 'nov',
+    'december': 'dec',
+}
+SCHEDULE_ALIASES: Dict[str, str] = {
+    **FREQUENCY_ALIASES,
+    **LOGIC_ALIASES,
+    **CRON_DAYS_OF_WEEK_ALIASES,
+    **CRON_MONTHS_ALIASES,
+}
+STARTING_KEYWORD: str = 'starting'
 
 def schedule_function(
         function: Callable[[Any], Any],
-        frequency: str,
+        schedule: str,
         *args,
         debug: bool = False,
         **kw
@@ -25,41 +83,222 @@ def schedule_function(
     function: Callable[[Any], Any]
         The function to execute.
 
-    frequency: str
-        The frequency at which `function` should be executed (e.g. `'daily'`).
+    schedule: str
+        The frequency schedule at which `function` should be executed (e.g. `'daily'`).
 
     """
     import warnings
     from meerschaum.utils.warnings import warn
-    from meerschaum.utils.packages import attempt_import
-    from meerschaum.utils.misc import filter_keywords
-    from concurrent.futures._base import CancelledError
+    from meerschaum.utils.misc import filter_keywords, round_time
     kw['debug'] = debug
     kw = filter_keywords(function, **kw)
 
-    def _wrapper():
-        return function(*args, **kw)
+    apscheduler = mrsm.attempt_import('apscheduler', lazy=False)
+    now = round_time(datetime.now(timezone.utc), timedelta(minutes=1))
+    trigger = parse_schedule(schedule, now=now)
 
-    pydantic = attempt_import('pydantic', debug=debug, lazy=False)
-    rocketry = attempt_import('rocketry', debug=debug, lazy=False)
-    try:
-        app = rocketry.Rocketry()
-        FuncTask = rocketry.tasks.FuncTask
-        with warnings.catch_warnings():
-            warnings.filterwarnings('ignore', 'Task\'s session not defined.')
-            task = FuncTask(_wrapper, start_cond=frequency)
-            app.session.add_task(task)
-        return app.run(debug=debug)
-    except (KeyboardInterrupt, CancelledError):
+    with apscheduler.Scheduler() as scheduler:
+        job = scheduler.add_schedule(function, trigger, args=args, kwargs=kw)
         try:
-            app.session.shut_down(force=True)
-        except CancelledError:
-            pass
-        return None
-    except AttributeError:
-        warn(
-            "Failed to import scheduler.\n\n   "
-            + "Run `mrsm install package 'pydantic<2.0.0'` and try again.",
-            stack = False,
+            scheduler.run_until_stopped()
+        except KeyboardInterrupt as e:
+            scheduler.stop()
+            scheduler.wait_until_stopped()
+
+
+def parse_schedule(schedule: str, now: Optional[datetime] = None):
+    """
+    Parse a schedule string (e.g. 'daily') into a Trigger object.
+    """
+    from meerschaum.utils.warnings import error
+    from meerschaum.utils.misc import items_str, is_int
+    (
+        apscheduler_triggers_cron,
+        apscheduler_triggers_interval,
+        apscheduler_triggers_calendarinterval,
+        apscheduler_triggers_combining,
+    ) = (
+        mrsm.attempt_import(
+            'apscheduler.triggers.cron',
+            'apscheduler.triggers.interval',
+            'apscheduler.triggers.calendarinterval',
+            'apscheduler.triggers.combining',
+            lazy = False,
         )
+    )
+
+    starting_ts = parse_start_time(schedule, now=now)
+    schedule = schedule.split(STARTING_KEYWORD)[0].strip()
+    for alias_keyword, true_keyword in SCHEDULE_ALIASES.items():
+        schedule = schedule.replace(alias_keyword, true_keyword)
+
+    ### TODO Allow for combining `and` + `or` logic.
+    if '&' in schedule and '|' in schedule:
+        error(f"Cannot accept both 'and' + 'or' logic in the schedule frequency.", ValueError)
+
+    join_str = '|' if '|' in schedule else '&'
+    join_trigger = (
+        apscheduler_triggers_combining.OrTrigger
+        if join_str == '|'
+        else apscheduler_triggers_combining.AndTrigger
+    )
+    join_kwargs = {
+        'max_iterations': 1_000_000,
+        'threshold': 0,
+    } if join_str == '&' else {}
+
+    schedule_parts = [part.strip() for part in schedule.split(join_str)]
+    triggers = []
+
+    has_seconds = 'second' in schedule
+    has_minutes = 'minute' in schedule
+    has_days = 'day' in schedule
+    has_weeks = 'week' in schedule
+    has_hours = 'hour' in schedule
+    num_hourly_intervals = schedule.count('hour')
+    divided_days = False
+    divided_hours = False
+
+    for schedule_part in schedule_parts:
+
+        ### Intervals must begin with 'every' (after alias substitution).
+        if schedule_part.lower().startswith('every '):
+            schedule_num_str, schedule_unit = (
+                schedule_part[len('every '):].split(' ', maxsplit=1)
+            )
+            schedule_unit = schedule_unit.rstrip('s') + 's'
+            if schedule_unit not in INTERVAL_UNITS:
+                error(
+                    f"Invalid interval '{schedule_unit}'.\n"
+                    + f"    Accepted values are {items_str(INTERVAL_UNITS)}.",
+                    ValueError,
+                )
+
+            schedule_num = (
+                int(schedule_num_str)
+                if is_int(schedule_num_str)
+                else float(schedule_num_str)
+            )
+
+            ### NOTE: When combining days or weeks with other schedules,
+            ### we must divide one of the day-schedules by 2.
+            ### TODO Remove this when APScheduler is patched.
+            if (
+                join_str == '&'
+                and (has_days or has_weeks)
+                and len(schedule_parts) > 1
+                and not divided_days
+            ):
+                schedule_num /= 2
+                divided_days = True
 
+            ### NOTE: When combining multiple hourly intervals,
+            ### one must be divided by 2.
+            if (
+                join_str == '&'
+                #  and num_hourly_intervals > 1
+                and len(schedule_parts) > 1
+                and not divided_hours
+            ):
+                print("divided hours")
+                schedule_num /= 2
+                #  divided_hours = True
+
+            trigger = (
+                apscheduler_triggers_interval.IntervalTrigger(
+                    **{
+                        schedule_unit: schedule_num,
+                        'start_time': starting_ts,
+                    }
+                )
+                if schedule_unit != 'months' else (
+                    apscheduler_triggers_calendarinterval.CalendarIntervalTrigger(
+                        **{
+                            schedule_unit: schedule_num,
+                            'start_date': starting_ts,
+                            #  'timezone': starting_ts.tzinfo, TODO Re-enable once APScheduler updates.
+                        }
+                    )
+                )
+            )
+
+        ### Determine whether this is a pure cron string or a cron subset (e.g. 'may-aug')_.
+        else:
+            first_three_prefix = schedule_part[:3] 
+            cron_kw = {}
+            if first_three_prefix in CRON_DAYS_OF_WEEK:
+                cron_kw['day_of_week'] = schedule_part
+            elif first_three_prefix in CRON_MONTHS:
+                cron_kw['month'] = schedule_part
+            trigger = (
+                apscheduler_triggers_cron.CronTrigger(
+                    **{
+                        **cron_kw,
+                        'hour': '*',
+                        'minute': '*' if has_minutes else starting_ts.minute,
+                        'second': '*' if has_seconds else starting_ts.second,
+                        'start_time': starting_ts,
+                        'timezone': starting_ts.tzinfo,
+                    }
+                )
+                if cron_kw
+                else apscheduler_triggers_cron.CronTrigger.from_crontab(
+                    schedule_part, 
+                    timezone = starting_ts.tzinfo,
+                )
+            )
+            ### Explicitly set the `start_time` after building with `from_crontab`.
+            if trigger.start_time != starting_ts:
+                trigger.start_time = starting_ts
+
+        triggers.append(trigger)
+
+    return (
+        join_trigger(triggers, **join_kwargs)
+        if len(triggers) != 1
+        else triggers[0]
+    )
+
+
+def parse_start_time(schedule: str, now: Optional[datetime] = None) -> datetime:
+    """
+    Return the datetime to use for the given schedule string.
+
+    Parameters
+    ----------
+    schedule: str
+        The schedule frequency to be parsed into a starting datetime.
+
+    now: Optional[datetime], default None
+        If provided, use this value as a default if no start time is explicitly stated.
+
+    Returns
+    -------
+    A `datetime` object, either `now` or the datetime embedded in the schedule string.
+
+    Examples
+    --------
+    >>> parse_start_time('daily starting 2024-01-01')
+    datetime.datetime(2024, 1, 1, 0, 0, tzinfo=datetime.timezone.utc)
+    >>> parse_start_time('monthly starting 1st')
+    datetime.datetime(2024, 5, 1, 0, 0, tzinfo=datetime.timezone.utc)
+    >>> parse_start_time('hourly starting 00:30')
+    datetime.datetime(2024, 5, 13, 0, 30, tzinfo=datetime.timezone.utc)
+    """
+    from meerschaum.utils.misc import round_time
+    from meerschaum.utils.warnings import error, warn
+    dateutil_parser = mrsm.attempt_import('dateutil.parser')
+    starting_parts = schedule.split(STARTING_KEYWORD)
+    starting_str = ('now' if len(starting_parts) == 1 else starting_parts[-1]).strip()
+    now = now or round_time(datetime.now(timezone.utc), timedelta(minutes=1))
+    try:
+        starting_ts = now if starting_str == 'now' else dateutil_parser.parse(starting_str)
+        schedule_parse_error = None
+    except Exception as e:
+        warn(f"Unable to parse starting time from '{starting_str}'.", stack=False)
+        schedule_parse_error = str(e)
+    if schedule_parse_error:
+        error(schedule_parse_error, ValueError, stack=False)
+    if not starting_ts.tzinfo:
+        starting_ts = starting_ts.replace(tzinfo=timezone.utc)
+    return starting_ts

meerschaum/utils/typing.py

@@ -86,7 +86,7 @@ PipesDict = Dict[
         ]
     ]
 ]
-WebState = Dict[str, str]
+WebState = Dict[str, Union[str, Dict[str, str]]]
 
 def is_success_tuple(x: Any) -> bool:
     """

{meerschaum-2.1.7.dist-info → meerschaum-2.2.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.1.7
+Version: 2.2.0.dev2
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -56,7 +56,7 @@ Requires-Dist: psutil >=5.8.0 ; extra == '_required'
 Requires-Dist: watchgod >=0.7.0 ; extra == '_required'
 Requires-Dist: dill >=0.3.3 ; extra == '_required'
 Requires-Dist: virtualenv >=20.1.0 ; extra == '_required'
-Requires-Dist: rocketry >=2.5.1 ; extra == '_required'
+Requires-Dist: apscheduler >=4.0.0a4 ; extra == '_required'
 Provides-Extra: api
 Requires-Dist: uvicorn[standard] >=0.22.0 ; extra == 'api'
 Requires-Dist: gunicorn >=20.1.0 ; extra == 'api'
@@ -66,7 +66,6 @@ Requires-Dist: fastapi >=0.100.0 ; extra == 'api'
 Requires-Dist: passlib >=1.7.4 ; extra == 'api'
 Requires-Dist: fastapi-login >=1.7.2 ; extra == 'api'
 Requires-Dist: python-multipart >=0.0.5 ; extra == 'api'
-Requires-Dist: pydantic <2.0.0 ; extra == 'api'
 Requires-Dist: httpx >=0.24.1 ; extra == 'api'
 Requires-Dist: numpy >=1.18.5 ; extra == 'api'
 Requires-Dist: pandas[parquet] >=2.0.1 ; extra == 'api'
@@ -79,7 +78,7 @@ Requires-Dist: databases >=0.4.0 ; extra == 'api'
 Requires-Dist: aiosqlite >=0.16.0 ; extra == 'api'
 Requires-Dist: asyncpg >=0.21.0 ; extra == 'api'
 Requires-Dist: cryptography >=38.0.1 ; extra == 'api'
-Requires-Dist: psycopg2-binary >=2.8.6 ; extra == 'api'
+Requires-Dist: psycopg[binary] >=3.1.18 ; extra == 'api'
 Requires-Dist: PyMySQL >=0.9.0 ; extra == 'api'
 Requires-Dist: aiomysql >=0.0.21 ; extra == 'api'
 Requires-Dist: sqlalchemy-cockroachdb >=2.0.0 ; extra == 'api'
@@ -106,7 +105,7 @@ Requires-Dist: psutil >=5.8.0 ; extra == 'api'
 Requires-Dist: watchgod >=0.7.0 ; extra == 'api'
 Requires-Dist: dill >=0.3.3 ; extra == 'api'
 Requires-Dist: virtualenv >=20.1.0 ; extra == 'api'
-Requires-Dist: rocketry >=2.5.1 ; extra == 'api'
+Requires-Dist: apscheduler >=4.0.0a4 ; 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'
@@ -124,8 +123,8 @@ Requires-Dist: dash-daq >=0.5.0 ; extra == 'api'
 Requires-Dist: terminado >=0.12.1 ; extra == 'api'
 Requires-Dist: tornado >=6.1.0 ; extra == 'api'
 Provides-Extra: build
-Requires-Dist: cx-Freeze >=6.5.1 ; extra == 'build'
-Requires-Dist: pyinstaller >=5.0.0-dev0 ; extra == 'build'
+Requires-Dist: cx-Freeze >=7.0.0 ; extra == 'build'
+Requires-Dist: pyinstaller >6.6.0 ; extra == 'build'
 Provides-Extra: cli
 Requires-Dist: pgcli >=3.1.0 ; extra == 'cli'
 Requires-Dist: mycli >=1.23.2 ; extra == 'cli'
@@ -161,7 +160,7 @@ Requires-Dist: mkdocs-redirects >=1.0.4 ; extra == 'docs'
 Requires-Dist: jinja2 ==3.0.3 ; extra == 'docs'
 Provides-Extra: drivers
 Requires-Dist: cryptography >=38.0.1 ; extra == 'drivers'
-Requires-Dist: psycopg2-binary >=2.8.6 ; extra == 'drivers'
+Requires-Dist: psycopg[binary] >=3.1.18 ; extra == 'drivers'
 Requires-Dist: PyMySQL >=0.9.0 ; extra == 'drivers'
 Requires-Dist: aiomysql >=0.0.21 ; extra == 'drivers'
 Requires-Dist: sqlalchemy-cockroachdb >=2.0.0 ; extra == 'drivers'
@@ -212,9 +211,9 @@ Requires-Dist: psutil >=5.8.0 ; extra == 'full'
 Requires-Dist: watchgod >=0.7.0 ; extra == 'full'
 Requires-Dist: dill >=0.3.3 ; extra == 'full'
 Requires-Dist: virtualenv >=20.1.0 ; extra == 'full'
-Requires-Dist: rocketry >=2.5.1 ; extra == 'full'
+Requires-Dist: apscheduler >=4.0.0a4 ; extra == 'full'
 Requires-Dist: cryptography >=38.0.1 ; extra == 'full'
-Requires-Dist: psycopg2-binary >=2.8.6 ; extra == 'full'
+Requires-Dist: psycopg[binary] >=3.1.18 ; extra == 'full'
 Requires-Dist: PyMySQL >=0.9.0 ; extra == 'full'
 Requires-Dist: aiomysql >=0.0.21 ; extra == 'full'
 Requires-Dist: sqlalchemy-cockroachdb >=2.0.0 ; extra == 'full'
@@ -249,7 +248,6 @@ Requires-Dist: fastapi >=0.100.0 ; extra == 'full'
 Requires-Dist: passlib >=1.7.4 ; extra == 'full'
 Requires-Dist: fastapi-login >=1.7.2 ; extra == 'full'
 Requires-Dist: python-multipart >=0.0.5 ; extra == 'full'
-Requires-Dist: pydantic <2.0.0 ; extra == 'full'
 Requires-Dist: httpx >=0.24.1 ; extra == 'full'
 Provides-Extra: gui
 Requires-Dist: toga >=0.3.0-dev29 ; extra == 'gui'
@@ -270,7 +268,7 @@ Requires-Dist: databases >=0.4.0 ; extra == 'sql'
 Requires-Dist: aiosqlite >=0.16.0 ; extra == 'sql'
 Requires-Dist: asyncpg >=0.21.0 ; extra == 'sql'
 Requires-Dist: cryptography >=38.0.1 ; extra == 'sql'
-Requires-Dist: psycopg2-binary >=2.8.6 ; extra == 'sql'
+Requires-Dist: psycopg[binary] >=3.1.18 ; extra == 'sql'
 Requires-Dist: PyMySQL >=0.9.0 ; extra == 'sql'
 Requires-Dist: aiomysql >=0.0.21 ; extra == 'sql'
 Requires-Dist: sqlalchemy-cockroachdb >=2.0.0 ; extra == 'sql'
@@ -297,9 +295,9 @@ Requires-Dist: psutil >=5.8.0 ; extra == 'sql'
 Requires-Dist: watchgod >=0.7.0 ; extra == 'sql'
 Requires-Dist: dill >=0.3.3 ; extra == 'sql'
 Requires-Dist: virtualenv >=20.1.0 ; extra == 'sql'
-Requires-Dist: rocketry >=2.5.1 ; extra == 'sql'
+Requires-Dist: apscheduler >=4.0.0a4 ; extra == 'sql'
 Provides-Extra: stack
-Requires-Dist: docker-compose >=1.27.4 ; extra == 'stack'
+Requires-Dist: docker-compose >=1.29.2 ; extra == 'stack'
 
 <img src="https://meerschaum.io/assets/banner_1920x320.png" alt="Meerschaum banner" style="width: 100%"/>