TypeDAL 3.0.0b1__py3-none-any.whl → 3.0.0b3__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.1"
+__version__ = "3.0.0-beta.3"

typedal/cli.py

@@ -156,10 +156,6 @@ def setup(
     # tomli has native Python types, tomlkit doesn't but preserves comments
     toml_obj: AnyDict = tomli.loads(toml_contents)
 
-    if "[tool.typedal]" in toml_contents:
-        section = toml_obj["tool"]["typedal"]
-        config.update(**section, _overwrite=True)
-
     if "[tool.pydal2sql]" in toml_contents:
         mapping = {"": ""}  # <- placeholder
 
@@ -176,6 +172,10 @@ def setup(
 
         config.update(**extra_config)
 
+    if "[tool.typedal]" in toml_contents:
+        section = toml_obj["tool"]["typedal"]
+        config.update(**section, _overwrite=True)
+
     data = asdict(config, with_top_level_key=False)
     data["migrate"] = None  # determined based on existence of input/output file.
 
@@ -257,6 +257,7 @@ def generate_migrations(
         format=output_format,
         input=filename_before,
         output=output_file,
+        _skip_none=True,
     )
 
     if pydal2sql_config.output and Path(pydal2sql_config.output).exists():
@@ -334,6 +335,7 @@ def run_migrations(
         create_flag_location=create_flag_location,
         db_folder=db_folder,
         migrations_file=migrations_file,
+        _skip_none=True,
     )
 
     if dry_run:
@@ -386,6 +388,7 @@ def fake_migrations(
         migrate_table=migrate_table,
         db_folder=db_folder,
         migrations_file=migrations_file,
+        _skip_none=True,
     )
 
     migrations = edwh_migrate.list_migrations(migrate_config)

typedal/config.py

@@ -10,9 +10,9 @@ from collections import defaultdict
 from pathlib import Path
 from typing import Any, Optional
 
-import black.files
 import tomli
 from configuraptor import TypedConfig, alias
+from configuraptor.helpers import find_pyproject_toml
 from dotenv import dotenv_values, find_dotenv
 
 from .types import AnyDict
@@ -122,12 +122,6 @@ class TypeDALConfig(TypedConfig):
         )
 
 
-def find_pyproject_toml(directory: str | None = None) -> typing.Optional[str]:
-    """
-    Find the project's config toml, looks up until it finds the project root (black's logic).
-    """
-    return black.files.find_pyproject_toml((directory or os.getcwd(),))
-
 
 def _load_toml(path: str | bool | None = True) -> tuple[str, AnyDict]:
     """
@@ -145,7 +139,7 @@ def _load_toml(path: str | bool | None = True) -> tuple[str, AnyDict]:
     elif Path(str(path)).is_file():
         toml_path = str(path)
     else:
-        toml_path = find_pyproject_toml(str(path))
+        toml_path = find_pyproject_toml(path)
 
     if not toml_path:
         # nothing to load
@@ -155,10 +149,10 @@ def _load_toml(path: str | bool | None = True) -> tuple[str, AnyDict]:
         with open(toml_path, "rb") as f:
             data = tomli.load(f)
 
-        return toml_path or "", typing.cast(AnyDict, data["tool"]["typedal"])
+        return str(toml_path) or "", typing.cast(AnyDict, data["tool"]["typedal"])
     except Exception as e:
         warnings.warn(f"Could not load typedal config toml: {e}", source=e)
-        return toml_path or "", {}
+        return str(toml_path) or "", {}
 
 
 def _load_dotenv(path: str | bool | None = True) -> tuple[str, AnyDict]:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TypeDAL
-Version: 3.0.0b1
+Version: 3.0.0b3
 Summary: Typing support for PyDAL
 Project-URL: Documentation, https://typedal.readthedocs.io/
 Project-URL: Issues, https://github.com/trialandsuccess/TypeDAL/issues
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
 Requires-Dist: configurable-json
-Requires-Dist: configuraptor>=1.26.0
+Requires-Dist: configuraptor>=1.26.2
 Requires-Dist: dill
 Requires-Dist: pydal
 Provides-Extra: all

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

@@ -1,8 +1,8 @@
-typedal/__about__.py,sha256=kwLcNN5Pp3UecGrkDwrZhNlc8mzQnru4Cyr75M2g1sM,213
+typedal/__about__.py,sha256=z4iEUmnb42f1UnaPUUgxVmozlPXkE5cI1pU9_rHHpqw,213
 typedal/__init__.py,sha256=QQpLiVl9w9hm2LBxey49Y_tCF_VB2bScVaS_mCjYy54,366
 typedal/caching.py,sha256=8UABVAhOlBpL96ykmqhxLaFYOe-XeAh7JoGh57OkxP8,11818
-typedal/cli.py,sha256=nivOZAv9URY05Mi2V6p1vZR_lLxgbOpeU3_ou-u5kWY,18352
-typedal/config.py,sha256=IsVgonD3E_V8J1k0YPHIknuGGT7_VwheMGRUFaMHiWc,11848
+typedal/cli.py,sha256=5-2U_pQOZNKHmhefiYtkd7g6B0DAXzjf4A1Jh7D37io,18427
+typedal/config.py,sha256=KDJXRsIQuFpSZy5XpSJiC_9WGLlmaOexACW0sWdCw54,11626
 typedal/core.py,sha256=qgJPvlcQYCujsjiiD6SOhWbIr1lxoUDpZUkMnK-mcDQ,95038
 typedal/fields.py,sha256=z2PD9vLWqBR_zXtiY0DthqTG4AeF3yxKoeuVfGXnSdg,5197
 typedal/for_py4web.py,sha256=d07b8hL_PvNDUS26Z5fDH2OxWb-IETBuAFPSzrRwm04,1285
@@ -12,7 +12,7 @@ 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.0b1.dist-info/METADATA,sha256=hWAftATKWchsGp3KwhSL4kGtlQU1lES8Ss2uhZtnm0M,7761
-typedal-3.0.0b1.dist-info/WHEEL,sha256=KGYbc1zXlYddvwxnNty23BeaKzh7YuoSIvIMO4jEhvw,87
-typedal-3.0.0b1.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.0.0b1.dist-info/RECORD,,
+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,,