TypeDAL 3.0.0b3__py3-none-any.whl → 3.0.1__py3-none-any.whl

typedal/__about__.py

@@ -5,4 +5,4 @@ This file contains the Version info for this package.
 # SPDX-FileCopyrightText: 2023-present Robin van der Noord <robinvandernoord@gmail.com>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "3.0.0-beta.3"
+__version__ = "3.0.1"

typedal/cli.py

@@ -2,7 +2,6 @@
 Typer CLI for TypeDAL.
 """
 
-import fnmatch
 import sys
 import typing
 import warnings
@@ -14,6 +13,7 @@ from configuraptor import asdict
 from configuraptor.alias import is_alias
 from configuraptor.helpers import is_optional
 
+from .helpers import match_strings
 from .types import AnyDict
 
 try:
@@ -240,7 +240,7 @@ def generate_migrations(
     output_format: OutputFormat_Option = None,
     output_file: Optional[str] = None,
     dry_run: bool = False,
-) -> bool:
+) -> bool:  # pragma: no cover
     """
     Run pydal2sql based on the typedal config.
     """
@@ -313,7 +313,7 @@ def run_migrations(
     schema: Optional[str] = None,
     create_flag_location: Optional[bool] = None,
     dry_run: bool = False,
-) -> bool:
+) -> bool:  # pragma: no cover
     """
     Run edwh-migrate based on the typedal config.
     """
@@ -345,20 +345,6 @@ def run_migrations(
     return True
 
 
-def match_strings(patterns: list[str] | str, string_list: list[str]) -> list[str]:
-    """
-    Glob but on a list of strings.
-    """
-    if isinstance(patterns, str):
-        patterns = [patterns]
-
-    matches = []
-    for pattern in patterns:
-        matches.extend([s for s in string_list if fnmatch.fnmatch(s, pattern)])
-
-    return matches
-
-
 @app.command(name="migrations.fake")
 @with_exit_code(hide_tb=IS_DEBUG)
 def fake_migrations(
@@ -370,7 +356,7 @@ def fake_migrations(
     db_folder: Optional[str] = None,
     migrate_table: Optional[str] = None,
     dry_run: bool = False,
-) -> int:
+) -> int:  # pragma: no cover
     """
     Mark one or more migrations as completed in the database, without executing the SQL code.
 
@@ -495,7 +481,7 @@ def cache_stats(
     fmt: typing.Annotated[
         str, typer.Option("--format", "--fmt", "-f", help="plaintext (default) or json")
     ] = "plaintext",
-) -> None:
+) -> None:  # pragma: no cover
     """
     Collect caching stats.
 
@@ -538,7 +524,7 @@ def cache_stats(
 def cache_clear(
     connection: typing.Annotated[str, typer.Option("--connection", "-c")] = None,
     purge: typing.Annotated[bool, typer.Option("--all", "--purge", "-p")] = False,
-) -> None:
+) -> None:  # pragma: no cover
     """
     Clear (expired) items from the cache.
 

typedal/config.py

@@ -122,8 +122,7 @@ class TypeDALConfig(TypedConfig):
         )
 
 
-
-def _load_toml(path: str | bool | None = True) -> tuple[str, AnyDict]:
+def _load_toml(path: str | bool | Path | None = True) -> tuple[str, AnyDict]:
     """
     Path can be a file, a directory, a bool or None.
 
@@ -136,10 +135,10 @@ def _load_toml(path: str | bool | None = True) -> tuple[str, AnyDict]:
         toml_path = None
     elif path in (True, None):
         toml_path = find_pyproject_toml()
-    elif Path(str(path)).is_file():
-        toml_path = str(path)
+    elif (_p := Path(str(path))) and _p.is_file():
+        toml_path = _p
     else:
-        toml_path = find_pyproject_toml(path)
+        toml_path = find_pyproject_toml(str(path))
 
     if not toml_path:
         # nothing to load

typedal/core.py

@@ -519,7 +519,7 @@ class TypeDAL(pydal.DAL):  # type: ignore
             if k not in relationships and (new_relationship := to_relationship(cls, k, annotations[k]))
         }
 
-        cache_dependency = kwargs.pop("cache_dependency", True)
+        cache_dependency = self._config.caching and kwargs.pop("cache_dependency", True)
 
         table: Table = self.define_table(tablename, *fields.values(), **kwargs)
 

typedal/helpers.py

@@ -2,6 +2,7 @@
 Helpers that work independently of core.
 """
 
+import fnmatch
 import io
 import types
 import typing
@@ -241,3 +242,17 @@ def as_lambda(value: T) -> typing.Callable[..., T]:
     Wrap value in a callable.
     """
     return lambda *_, **__: value
+
+
+def match_strings(patterns: list[str] | str, string_list: list[str]) -> list[str]:
+    """
+    Glob but on a list of strings.
+    """
+    if isinstance(patterns, str):
+        patterns = [patterns]
+
+    matches = []
+    for pattern in patterns:
+        matches.extend([s for s in string_list if fnmatch.fnmatch(s, pattern)])
+
+    return matches

{typedal-3.0.0b3.dist-info → typedal-3.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: TypeDAL
-Version: 3.0.0b3
+Version: 3.0.1
 Summary: Typing support for PyDAL
 Project-URL: Documentation, https://typedal.readthedocs.io/
 Project-URL: Issues, https://github.com/trialandsuccess/TypeDAL/issues
@@ -22,7 +22,7 @@ Requires-Dist: pydal
 Provides-Extra: all
 Requires-Dist: edwh-migrate>=0.8.0b1; extra == 'all'
 Requires-Dist: py4web; extra == 'all'
-Requires-Dist: pydal2sql[all]; extra == 'all'
+Requires-Dist: pydal2sql[all]>=1.1.3; extra == 'all'
 Requires-Dist: questionary; extra == 'all'
 Requires-Dist: tabulate; extra == 'all'
 Requires-Dist: tomlkit; extra == 'all'
@@ -37,8 +37,8 @@ Requires-Dist: su6[all]; extra == 'dev'
 Requires-Dist: types-pyyaml; extra == 'dev'
 Requires-Dist: types-tabulate; extra == 'dev'
 Provides-Extra: migrations
-Requires-Dist: edwh-migrate; extra == 'migrations'
-Requires-Dist: pydal2sql; extra == 'migrations'
+Requires-Dist: edwh-migrate>=0.8.0b1; extra == 'migrations'
+Requires-Dist: pydal2sql>=1.1.3; extra == 'migrations'
 Requires-Dist: questionary; extra == 'migrations'
 Requires-Dist: tabulate; extra == 'migrations'
 Requires-Dist: tomlkit; extra == 'migrations'

{typedal-3.0.0b3.dist-info → typedal-3.0.1.dist-info}/RECORD

@@ -1,18 +1,18 @@
-typedal/__about__.py,sha256=z4iEUmnb42f1UnaPUUgxVmozlPXkE5cI1pU9_rHHpqw,213
+typedal/__about__.py,sha256=8UfBCir8PsjPHcCRJyA0FLS1a3orteNLkZd6vHHlXjc,206
 typedal/__init__.py,sha256=QQpLiVl9w9hm2LBxey49Y_tCF_VB2bScVaS_mCjYy54,366
 typedal/caching.py,sha256=8UABVAhOlBpL96ykmqhxLaFYOe-XeAh7JoGh57OkxP8,11818
-typedal/cli.py,sha256=5-2U_pQOZNKHmhefiYtkd7g6B0DAXzjf4A1Jh7D37io,18427
-typedal/config.py,sha256=KDJXRsIQuFpSZy5XpSJiC_9WGLlmaOexACW0sWdCw54,11626
-typedal/core.py,sha256=qgJPvlcQYCujsjiiD6SOhWbIr1lxoUDpZUkMnK-mcDQ,95038
+typedal/cli.py,sha256=3tge8B-YjgjMC6425-RMczmWvpOTfWV5QYPXRY23IWA,18200
+typedal/config.py,sha256=jS1K0_1F5rwJtvwTZ-qR29ZCX7WlyORGEIFvfSnusko,11645
+typedal/core.py,sha256=nHJ2Iq67rFIB4j43KCCD-tLIjvvvf4oJhT9T6tjXqxU,95063
 typedal/fields.py,sha256=z2PD9vLWqBR_zXtiY0DthqTG4AeF3yxKoeuVfGXnSdg,5197
 typedal/for_py4web.py,sha256=d07b8hL_PvNDUS26Z5fDH2OxWb-IETBuAFPSzrRwm04,1285
 typedal/for_web2py.py,sha256=zvd5xC-SmuKc0JLDqT3hMIs6COaYnwTFXD_BIeC1vug,1832
-typedal/helpers.py,sha256=BFuGd-1tBA1-QS91C9PEvNY5z5KFHd3gTplxxDWdwSo,6509
+typedal/helpers.py,sha256=n9dpIjXIjPpVFQnLBQreTWqRDR6hIsoNt8vGdEHGo_s,6871
 typedal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 typedal/types.py,sha256=1kGkNX6vfGg6ln84AG558C4Zx5ACRz-emrUTnuy-rRY,3410
 typedal/web2py_py4web_shared.py,sha256=cEbjkK0WOS9Q0nTyZuQaJWffeP4bjrL79Bx0xGy_UOs,1504
 typedal/serializers/as_json.py,sha256=ffo152W-sARYXym4BzwX709rrO2-QwKk2KunWY8RNl4,2229
-typedal-3.0.0b3.dist-info/METADATA,sha256=iGCNeR9M9shZ95huWQwV1tepKZyEB2ryoljRoJSahMg,7761
-typedal-3.0.0b3.dist-info/WHEEL,sha256=KGYbc1zXlYddvwxnNty23BeaKzh7YuoSIvIMO4jEhvw,87
-typedal-3.0.0b3.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.0.0b3.dist-info/RECORD,,
+typedal-3.0.1.dist-info/METADATA,sha256=GTmtFnSnOhgJI-P_hriMxRSZJf1EkEu9cT6eV2APM0s,7782
+typedal-3.0.1.dist-info/WHEEL,sha256=uNdcs2TADwSd5pVaP0Z_kcjcvvTUklh2S7bxZMF8Uj0,87
+typedal-3.0.1.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
+typedal-3.0.1.dist-info/RECORD,,

{typedal-3.0.0b3.dist-info → typedal-3.0.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.17.1
+Generator: hatchling 1.22.4
 Root-Is-Purelib: true
 Tag: py3-none-any