WIP: Initial refactor for pydantic v2

* import missing modules, remove unused demonstration asset module. * Import working; syntax issues fixed; real unit tests broken.
catalyst-cooperative · Nov 22, 2023 · cf8d4f1 · cf8d4f1
1 parent fd0f525
commit cf8d4f1
Show file tree

Hide file tree

Showing 18 changed files with 302 additions and 389 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,8 @@
 docs/data_dictionaries/pudl_db.rst
 .ipynb_checkpoints/
 .cache/
+.ruff_cache/
+.mypy_cache/
 .pytest_cache/*
 .DS_Store
 build/

diff --git a/pyproject.toml b/pyproject.toml
@@ -50,10 +50,8 @@ dependencies = [
     "pandera>=0.17.2",
     "pre-commit>=3",
     "pyarrow>=14.0.1", # pandas[parquet]
-    "pydantic>=1.10,<2",
-    # Required after pandera-core is retired and we switch to pydantic v2
-    #"pydantic>=2.4",
-    #"pydantic-settings>=2",
+    "pydantic>=2.4",
+    "pydantic-settings>=2",
     "pytest>=7.4",
     "pytest-cov>=4.1",
     "pytest-console-scripts>=1.4",
@@ -220,10 +218,6 @@ exclude = ["migrations/versions/*"]
 "test/*" = ["D"]
 "migrations/*" = ["D", "Q"]
 
-[tool.ruff.pep8-naming]
-# Allow Pydantic's `@validator` decorator to trigger class method treatment.
-classmethod-decorators = ["pydantic.validator", "pydantic.root_validator"]
-
 [tool.ruff.isort]
 known-first-party = ["pudl"]
 

diff --git a/src/pudl/__init__.py b/src/pudl/__init__.py
@@ -8,6 +8,7 @@
     convert,
     etl,
     extract,
+    ferc_to_sqlite,
     glue,
     helpers,
     io_managers,

diff --git a/src/pudl/etl/__init__.py b/src/pudl/etl/__init__.py
@@ -21,6 +21,7 @@
 from pudl.settings import EtlSettings
 
 from . import (
+    check_foreign_keys,
     eia_bulk_elec_assets,
     epacems_assets,
     glue_assets,

diff --git a/src/pudl/etl/analysis_assets.py b/src/pudl/etl/analysis_assets.py