diff options
28 files changed, 28 insertions, 28 deletions
diff --git a/generalresearch/incite/base.py b/generalresearch/incite/base.py index ba7d3e9..aa64bf0 100644 --- a/generalresearch/incite/base.py +++ b/generalresearch/incite/base.py @@ -31,7 +31,7 @@ import dask.dataframe as dd import pandas as pd import pyarrow.parquet as pq from distributed import Client -from pandera import DataFrameSchema +from pandera.pandas import DataFrameSchema from pydantic import ( BaseModel, ConfigDict, diff --git a/generalresearch/incite/collections/__init__.py b/generalresearch/incite/collections/__init__.py index a14b438..ebe774e 100644 --- a/generalresearch/incite/collections/__init__.py +++ b/generalresearch/incite/collections/__init__.py @@ -16,7 +16,7 @@ import pyarrow.parquet as pq from dask.distributed import Future from distributed import Client, as_completed from more_itertools import chunked -from pandera import DataFrameSchema +from pandera.pandas import DataFrameSchema from psycopg import Cursor from pydantic import Field, FilePath, ValidationInfo, field_validator from sentry_sdk import capture_exception diff --git a/generalresearch/incite/mergers/__init__.py b/generalresearch/incite/mergers/__init__.py index 6f91eee..b9c3789 100644 --- a/generalresearch/incite/mergers/__init__.py +++ b/generalresearch/incite/mergers/__init__.py @@ -9,7 +9,7 @@ from typing import List, Optional, Type import dask.dataframe as dd import pandas as pd from dask.distributed import Client -from pandera import DataFrameSchema +from pandera.pandas import DataFrameSchema from pydantic import Field, ValidationInfo, field_validator, model_validator from typing_extensions import Self diff --git a/generalresearch/incite/schemas/admin_responses.py b/generalresearch/incite/schemas/admin_responses.py index ccfe1cf..bb2852f 100644 --- a/generalresearch/incite/schemas/admin_responses.py +++ b/generalresearch/incite/schemas/admin_responses.py @@ -1,6 +1,6 @@ from datetime import datetime -from pandera import ( +from pandera.pandas import ( Check, Column, DataFrameSchema, diff --git a/generalresearch/incite/schemas/mergers/foundations/enriched_session.py b/generalresearch/incite/schemas/mergers/foundations/enriched_session.py index ee17bda..a7282e0 100644 --- a/generalresearch/incite/schemas/mergers/foundations/enriched_session.py +++ b/generalresearch/incite/schemas/mergers/foundations/enriched_session.py @@ -1,6 +1,6 @@ from datetime import timedelta -from pandera import Check, Column, DataFrameSchema +from pandera.pandas import Check, Column, DataFrameSchema from generalresearch.incite.schemas import ARCHIVE_AFTER, ORDER_KEY, PARTITION_ON from generalresearch.incite.schemas.thl_web import THLSessionSchema diff --git a/generalresearch/incite/schemas/mergers/foundations/enriched_task_adjust.py b/generalresearch/incite/schemas/mergers/foundations/enriched_task_adjust.py index 7b43589..cc909f6 100644 --- a/generalresearch/incite/schemas/mergers/foundations/enriched_task_adjust.py +++ b/generalresearch/incite/schemas/mergers/foundations/enriched_task_adjust.py @@ -1,7 +1,7 @@ from typing import Set import pandas as pd -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.incite.schemas import ARCHIVE_AFTER, ORDER_KEY from generalresearch.incite.schemas.thl_web import THLTaskAdjustmentSchema diff --git a/generalresearch/incite/schemas/mergers/foundations/enriched_wall.py b/generalresearch/incite/schemas/mergers/foundations/enriched_wall.py index 8d16270..1443f28 100644 --- a/generalresearch/incite/schemas/mergers/foundations/enriched_wall.py +++ b/generalresearch/incite/schemas/mergers/foundations/enriched_wall.py @@ -1,7 +1,7 @@ from datetime import timedelta import pandas as pd -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.incite.schemas import ARCHIVE_AFTER, PARTITION_ON from generalresearch.locales import Localelator diff --git a/generalresearch/incite/schemas/mergers/foundations/user_id_product.py b/generalresearch/incite/schemas/mergers/foundations/user_id_product.py index 160f05b..a07ca42 100644 --- a/generalresearch/incite/schemas/mergers/foundations/user_id_product.py +++ b/generalresearch/incite/schemas/mergers/foundations/user_id_product.py @@ -1,6 +1,6 @@ from datetime import timedelta -from pandera import Category, Check, Column, DataFrameSchema, Index +from pandera.pandas import Category, Check, Column, DataFrameSchema, Index from generalresearch.incite.schemas import ARCHIVE_AFTER diff --git a/generalresearch/incite/schemas/mergers/pop_ledger.py b/generalresearch/incite/schemas/mergers/pop_ledger.py index af8e0c8..fdb1b05 100644 --- a/generalresearch/incite/schemas/mergers/pop_ledger.py +++ b/generalresearch/incite/schemas/mergers/pop_ledger.py @@ -2,7 +2,7 @@ from datetime import timedelta import pandas as pd from more_itertools import flatten -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.incite.schemas import ARCHIVE_AFTER, ORDER_KEY, PARTITION_ON from generalresearch.incite.schemas.thl_web import TxSchema diff --git a/generalresearch/incite/schemas/mergers/ym_survey_wall.py b/generalresearch/incite/schemas/mergers/ym_survey_wall.py index 3882bd1..724534b 100644 --- a/generalresearch/incite/schemas/mergers/ym_survey_wall.py +++ b/generalresearch/incite/schemas/mergers/ym_survey_wall.py @@ -1,6 +1,6 @@ from datetime import timedelta -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.incite.schemas import ARCHIVE_AFTER, ORDER_KEY from generalresearch.incite.schemas.thl_web import THLSessionSchema, THLWallSchema diff --git a/generalresearch/incite/schemas/mergers/ym_wall_summary.py b/generalresearch/incite/schemas/mergers/ym_wall_summary.py index 37a517f..16cfc2f 100644 --- a/generalresearch/incite/schemas/mergers/ym_wall_summary.py +++ b/generalresearch/incite/schemas/mergers/ym_wall_summary.py @@ -2,7 +2,7 @@ from __future__ import annotations from datetime import timedelta -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.incite.schemas import ARCHIVE_AFTER from generalresearch.locales import Localelator diff --git a/generalresearch/incite/schemas/thl_marketplaces.py b/generalresearch/incite/schemas/thl_marketplaces.py index 6d7b83b..e299521 100644 --- a/generalresearch/incite/schemas/thl_marketplaces.py +++ b/generalresearch/incite/schemas/thl_marketplaces.py @@ -2,7 +2,7 @@ import copy from datetime import timedelta import pandas as pd -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.incite.schemas import ARCHIVE_AFTER, ORDER_KEY diff --git a/generalresearch/incite/schemas/thl_web.py b/generalresearch/incite/schemas/thl_web.py index c57a233..5073a18 100644 --- a/generalresearch/incite/schemas/thl_web.py +++ b/generalresearch/incite/schemas/thl_web.py @@ -1,7 +1,7 @@ from datetime import datetime, timedelta, timezone import pandas as pd -from pandera import Check, Column, DataFrameSchema, Index, MultiIndex +from pandera.pandas import Check, Column, DataFrameSchema, Index, MultiIndex from generalresearch.incite.schemas import ARCHIVE_AFTER, ORDER_KEY from generalresearch.locales import Localelator diff --git a/generalresearch/models/cint/task_collection.py b/generalresearch/models/cint/task_collection.py index afd9fc4..5d39090 100644 --- a/generalresearch/models/cint/task_collection.py +++ b/generalresearch/models/cint/task_collection.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import List import pandas as pd -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.locales import Localelator from generalresearch.models.cint.survey import CintSurvey diff --git a/generalresearch/models/dynata/task_collection.py b/generalresearch/models/dynata/task_collection.py index b1b7c3e..71cf3db 100644 --- a/generalresearch/models/dynata/task_collection.py +++ b/generalresearch/models/dynata/task_collection.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import Any import pandas as pd -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.locales import Localelator from generalresearch.models import TaskCalculationType diff --git a/generalresearch/models/innovate/task_collection.py b/generalresearch/models/innovate/task_collection.py index 88cac8c..7bf9d0f 100644 --- a/generalresearch/models/innovate/task_collection.py +++ b/generalresearch/models/innovate/task_collection.py @@ -1,7 +1,7 @@ from __future__ import annotations import pandas as pd -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.locales import Localelator from generalresearch.models.innovate import InnovateStatus diff --git a/generalresearch/models/morning/task_collection.py b/generalresearch/models/morning/task_collection.py index b39f01b..eb4cbd1 100644 --- a/generalresearch/models/morning/task_collection.py +++ b/generalresearch/models/morning/task_collection.py @@ -1,7 +1,7 @@ from __future__ import annotations import pandas as pd -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.locales import Localelator from generalresearch.models.morning import MorningStatus diff --git a/generalresearch/models/precision/task_collection.py b/generalresearch/models/precision/task_collection.py index bd7b274..233d329 100644 --- a/generalresearch/models/precision/task_collection.py +++ b/generalresearch/models/precision/task_collection.py @@ -1,7 +1,7 @@ from typing import Any, Dict, List import pandas as pd -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.locales import Localelator from generalresearch.models.precision import PrecisionStatus diff --git a/generalresearch/models/prodege/task_collection.py b/generalresearch/models/prodege/task_collection.py index 364c5ff..19e594f 100644 --- a/generalresearch/models/prodege/task_collection.py +++ b/generalresearch/models/prodege/task_collection.py @@ -1,7 +1,7 @@ from typing import Any, Dict, List import pandas as pd -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.locales import Localelator from generalresearch.models.prodege import ProdegeStatus diff --git a/generalresearch/models/repdata/task_collection.py b/generalresearch/models/repdata/task_collection.py index b79808d..d625349 100644 --- a/generalresearch/models/repdata/task_collection.py +++ b/generalresearch/models/repdata/task_collection.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import Any import pandas as pd -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.locales import Localelator from generalresearch.models import TaskCalculationType diff --git a/generalresearch/models/sago/task_collection.py b/generalresearch/models/sago/task_collection.py index 08de55f..2879d9c 100644 --- a/generalresearch/models/sago/task_collection.py +++ b/generalresearch/models/sago/task_collection.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import Any import pandas as pd -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.locales import Localelator from generalresearch.models.sago import SagoStatus diff --git a/generalresearch/models/spectrum/task_collection.py b/generalresearch/models/spectrum/task_collection.py index 4db866b..6715378 100644 --- a/generalresearch/models/spectrum/task_collection.py +++ b/generalresearch/models/spectrum/task_collection.py @@ -1,7 +1,7 @@ from __future__ import annotations import pandas as pd -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.locales import Localelator from generalresearch.models import TaskCalculationType diff --git a/generalresearch/schemas/survey_stats.py b/generalresearch/schemas/survey_stats.py index 1570554..0d509e1 100644 --- a/generalresearch/schemas/survey_stats.py +++ b/generalresearch/schemas/survey_stats.py @@ -1,5 +1,5 @@ import pandas as pd -from pandera import Check, Column, DataFrameSchema, Index +from pandera.pandas import Check, Column, DataFrameSchema, Index from generalresearch.locales import Localelator from generalresearch.models import Source diff --git a/tests/incite/collections/test_df_collection_base.py b/tests/incite/collections/test_df_collection_base.py index 10f025b..31d1720 100644 --- a/tests/incite/collections/test_df_collection_base.py +++ b/tests/incite/collections/test_df_collection_base.py @@ -3,7 +3,7 @@ from typing import TYPE_CHECKING import pandas as pd import pytest -from pandera import DataFrameSchema +from pandera.pandas import DataFrameSchema from generalresearch.incite.collections import ( DFCollection, diff --git a/tests/incite/collections/test_df_collection_item_thl_web.py b/tests/incite/collections/test_df_collection_item_thl_web.py index 29f3677..a858fbe 100644 --- a/tests/incite/collections/test_df_collection_item_thl_web.py +++ b/tests/incite/collections/test_df_collection_item_thl_web.py @@ -21,7 +21,7 @@ from distributed.utils_test import ( loop_in_thread, ) from faker import Faker -from pandera import DataFrameSchema +from pandera.pandas import DataFrameSchema from pydantic import FilePath from generalresearch.incite.base import CollectionItemBase diff --git a/tests/incite/collections/test_df_collection_thl_marketplaces.py b/tests/incite/collections/test_df_collection_thl_marketplaces.py index 54c27f7..8ce8acc 100644 --- a/tests/incite/collections/test_df_collection_thl_marketplaces.py +++ b/tests/incite/collections/test_df_collection_thl_marketplaces.py @@ -3,7 +3,7 @@ from itertools import product from typing import TYPE_CHECKING import pytest -from pandera import Column, DataFrameSchema, Index +from pandera.pandas import Column, DataFrameSchema, Index from generalresearch.incite.collections import DFCollection, DFCollectionType from generalresearch.incite.collections.thl_marketplaces import ( diff --git a/tests/incite/collections/test_df_collection_thl_web.py b/tests/incite/collections/test_df_collection_thl_web.py index 51ca128..c64dac8 100644 --- a/tests/incite/collections/test_df_collection_thl_web.py +++ b/tests/incite/collections/test_df_collection_thl_web.py @@ -5,7 +5,7 @@ from typing import TYPE_CHECKING import dask.dataframe as dd import pandas as pd import pytest -from pandera import DataFrameSchema +from pandera.pandas import DataFrameSchema from generalresearch.incite.collections import DFCollection, DFCollectionType diff --git a/tests/incite/mergers/test_merge_collection.py b/tests/incite/mergers/test_merge_collection.py index 692cac3..ec507bc 100644 --- a/tests/incite/mergers/test_merge_collection.py +++ b/tests/incite/mergers/test_merge_collection.py @@ -3,7 +3,7 @@ from itertools import product import pandas as pd import pytest -from pandera import DataFrameSchema +from pandera.pandas import DataFrameSchema from generalresearch.incite.mergers import ( MergeCollection, |