Merge pull request #168 from josephgruber-umbra/pydantic_v1_namespace…

…_support

Switch to Pydantic v1 namespace and allow Pydantic v1 or v2

.pre-commit-config.yaml

@@ -30,4 +30,4 @@ repos:
         # No reason to run if only tests have changed. They intentionally break typing.
         exclude: tests/.*
         additional_dependencies:
-        - pydantic~=1.0
+        - pydantic>1.10.18,<3

geojson_pydantic/features.py

@@ -2,8 +2,8 @@
 
 from typing import Any, Dict, Generic, Iterator, List, Literal, Optional, TypeVar, Union
 
-from pydantic import BaseModel, Field, StrictInt, StrictStr, validator
-from pydantic.generics import GenericModel
+from pydantic.v1 import BaseModel, Field, StrictInt, StrictStr, validator
+from pydantic.v1.generics import GenericModel
 
 from geojson_pydantic.geo_interface import GeoInterfaceMixin
 from geojson_pydantic.geometries import Geometry, GeometryCollection

geojson_pydantic/geometries.py

@@ -5,8 +5,8 @@
 import warnings
 from typing import Any, Iterator, List, Literal, Optional, Union
 
-from pydantic import BaseModel, Field, ValidationError, validator
-from pydantic.error_wrappers import ErrorWrapper
+from pydantic.v1 import BaseModel, Field, ValidationError, validator
+from pydantic.v1.error_wrappers import ErrorWrapper
 from typing_extensions import Annotated
 
 from geojson_pydantic.geo_interface import GeoInterfaceMixin

geojson_pydantic/types.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, List, Optional, Tuple, TypeVar, Union
 
-from pydantic import conlist
+from pydantic.v1 import conlist
 
 T = TypeVar("T")
 

pyproject.toml

@@ -21,7 +21,7 @@ classifiers = [
     "Typing :: Typed",
 ]
 dynamic = ["version"]
-dependencies = ["pydantic~=1.0"]
+dependencies = ["pydantic>1.10.18,<3"]
 
 [project.optional-dependencies]
 test = ["pytest", "pytest-cov", "shapely"]

tests/test_features.py

@@ -3,7 +3,7 @@
 from uuid import uuid4
 
 import pytest
-from pydantic import BaseModel, ValidationError
+from pydantic.v1 import BaseModel, ValidationError
 
 from geojson_pydantic.features import Feature, FeatureCollection
 from geojson_pydantic.geometries import (

tests/test_geometries.py

@@ -2,7 +2,7 @@
 from typing import Union
 
 import pytest
-from pydantic import ValidationError
+from pydantic.v1 import ValidationError
 from shapely.geometry import shape
 
 from geojson_pydantic.geometries import (