diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 44384ca..4e2baa1 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -44,8 +44,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install .[dev,server,validation] - python -m pip install "pypgstac==${{ matrix.pypgstac }}" + python -m pip install .[dev,server,validation] "pypgstac==${{ matrix.pypgstac }}" - name: Run test suite run: python -m pytest --cov stac_fastapi.pgstac --cov-report xml --cov-report term-missing diff --git a/.gitignore b/.gitignore index 1c7b79a..49df092 100644 --- a/.gitignore +++ b/.gitignore @@ -126,6 +126,7 @@ build.out # Virtualenv venv +.venv # IDE .vscode diff --git a/setup.py b/setup.py index 8d38ea5..6e8694a 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ "buildpg", "brotli_asgi", "cql2>=0.3.6", - "pypgstac>=0.8,<0.10", + "hydraters>=0.1.3", "typing_extensions>=4.9.0", "jsonpatch>=1.33.0", "json-merge-patch>=0.3.0", @@ -25,7 +25,7 @@ extra_reqs = { "dev": [ "pystac[validation]", - "pypgstac[psycopg]==0.9.*", + "pypgstac[psycopg]>=0.8,<0.10", "pytest-postgresql", "pytest", "pytest-cov", diff --git a/stac_fastapi/pgstac/core.py b/stac_fastapi/pgstac/core.py index d159ba6..417e173 100644 --- a/stac_fastapi/pgstac/core.py +++ b/stac_fastapi/pgstac/core.py @@ -11,8 +11,8 @@ from buildpg import render from cql2 import Expr from fastapi import HTTPException, Request +from hydraters import hydrate from pydantic import ValidationError -from pypgstac.hydration import hydrate from stac_fastapi.api.models import JSONResponse from stac_fastapi.types.core import AsyncBaseCoreClient, Relations from stac_fastapi.types.errors import InvalidQueryParameter, NotFoundError