fix: no more pydantic

vaexio · Jul 10, 2023 · 4d94ac0 · 4d94ac0
1 parent ff84b2e
commit 4d94ac0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 22 deletions.
diff --git a/ci/conda-env.yml b/ci/conda-env.yml
@@ -40,8 +40,6 @@ dependencies:
 - python-graphviz
 - py-xgboost
 - pyyaml
-- pydantic
-- pydantic-settings
 - rich
 - s3fs>=2021.8.0
 - scikit-learn

diff --git a/packages/vaex-core/vaex/settings.py b/packages/vaex-core/vaex/settings.py
@@ -19,25 +19,6 @@
     has_dotenv = False
 
 
-# with pydantic 2.0, we require pydantic_settings
-# has_pydantic_settings = False
-try:
-    import pydantic_settings
-except ModuleNotFoundError:
-    # we should be on pydantic 1.x
-    BaseSettings = pydantic.BaseSettings
-    has_pydantic_settings = False
-else:
-    major = pydantic_settings.__version__.split(".")[0]
-    if major != "0":
-        # but the old pydantic_settings is unrelated
-        BaseSettings = pydantic_settings.BaseSettings
-        has_pydantic_settings = True
-    else:
-        # we should be on pydantic 2.x
-        BaseSettings = pydantic.BaseSettings
-        has_pydantic_settings = False
-
 logger = logging.getLogger("vaex.settings")
 _default_home = vaex.utils.get_vaex_home()
 

diff --git a/packages/vaex-server/vaex/server/fastapi.py b/packages/vaex-server/vaex/server/fastapi.py
@@ -19,7 +19,7 @@
 import requests
 
 
-from pydantic import BaseModel, BaseSettings
+from pydantic import BaseModel
 from starlette.responses import HTMLResponse, PlainTextResponse