add back 0.8 support but allow skip tests

Author: vincentsarago

.github/workflows/cicd.yaml

@@ -13,10 +13,11 @@ jobs:
       matrix:
         include:
           - {python: '3.12', pypgstac: '0.9.*'}
-          - {python: '3.11', pypgstac: '0.9.*'}
-          - {python: '3.10', pypgstac: '0.9.*'}
-          - {python: '3.9', pypgstac: '0.9.*'}
-          - {python: '3.8', pypgstac: '0.9.*'}
+          - {python: '3.12', pypgstac: '0.8.*'}
+          - {python: '3.11', pypgstac: '0.8.*'}
+          - {python: '3.10', pypgstac: '0.8.*'}
+          - {python: '3.9', pypgstac: '0.8.*'}
+          - {python: '3.8', pypgstac: '0.8.*'}
 
     timeout-minutes: 20
 

setup.py

@@ -17,7 +17,7 @@
     "buildpg",
     "brotli_asgi",
     "pygeofilter>=0.2",
-    "pypgstac>=0.9,<0.10",
+    "pypgstac>=0.8,<0.10",
 ]
 
 extra_reqs = {

tests/conftest.py

@@ -12,6 +12,7 @@
 from fastapi import APIRouter
 from fastapi.responses import ORJSONResponse
 from httpx import ASGITransport, AsyncClient
+from pypgstac import __version__ as pgstac_version
 from pypgstac.db import PgstacDB
 from pypgstac.migrate import Migrate
 from pytest_postgresql.janitor import DatabaseJanitor
@@ -48,6 +49,12 @@
 logger = logging.getLogger(__name__)
 
 
+requires_pgstac_0_9_2 = pytest.mark.skipif(
+    tuple(map(int, pgstac_version.split("."))) < (0, 9, 2),
+    reason="at least PgSTAC>0.9.2 required",
+)
+
+
 @pytest.fixture(scope="session")
 def event_loop():
     return asyncio.get_event_loop()

tests/resources/test_collection.py

@@ -4,6 +4,8 @@
 import pytest
 from stac_pydantic import Collection
 
+from ..conftest import requires_pgstac_0_9_2
+
 
 async def test_create_collection(app_client, load_test_data: Callable):
     in_json = load_test_data("test_collection.json")
@@ -305,8 +307,9 @@ async def test_get_collections_search(
     assert len(resp.json()["collections"]) == 2
 
 
+@requires_pgstac_0_9_2
 @pytest.mark.asyncio
-async def test_get_collections_search_limit_offset(
+async def test_get_collections_search_pagination(
     app_client, load_test_collection, load_test2_collection
 ):
     resp = await app_client.get("/collections")
@@ -419,23 +422,6 @@ async def test_get_collections_search_limit_offset(
     prev_link = list(filter(lambda link: link["rel"] == "previous", links))[0]
     assert "offset" not in prev_link["href"]
 
-    ###################
-    # BUG: pgstac doesn't return a `prev` link when limit is not set
-    # offset=1, should have a `previous` link
-    # resp = await app_client.get(
-    #     "/collections",
-    #     params={"offset": 1},
-    # )
-    # cols = resp.json()["collections"]
-    # links = resp.json()["links"]
-    # assert len(cols) == 1
-    # assert cols[0]["id"] == load_test2_collection.id
-    # assert len(links) == 3
-    # assert {"root", "self", "previous"} == {link["rel"] for link in links}
-    # prev_link = list(filter(lambda link: link["rel"] == "previous", links))[0]
-    # # offset=0 should not be in the previous link (because it's useless)
-    # assert "offset" not in prev_link["href"]
-
     ###################
     # offset=0, should not have next/previous link
     resp = await app_client.get(
@@ -447,3 +433,25 @@ async def test_get_collections_search_limit_offset(
     assert len(cols) == 2
     assert len(links) == 2
     assert {"root", "self"} == {link["rel"] for link in links}
+
+
+@pytest.mark.xfail(strict=False)
+@pytest.mark.asyncio
+async def test_get_collections_search_offset_1(
+    app_client, load_test_collection, load_test2_collection
+):
+    # BUG: pgstac doesn't return a `prev` link when limit is not set
+    # offset=1, should have a `previous` link
+    resp = await app_client.get(
+        "/collections",
+        params={"offset": 1},
+    )
+    cols = resp.json()["collections"]
+    links = resp.json()["links"]
+    assert len(cols) == 1
+    assert cols[0]["id"] == load_test2_collection.id
+    assert len(links) == 3
+    assert {"root", "self", "previous"} == {link["rel"] for link in links}
+    prev_link = list(filter(lambda link: link["rel"] == "previous", links))[0]
+    # offset=0 should not be in the previous link (because it's useless)
+    assert "offset" not in prev_link["href"]