Skip to content

Commit 0c0a10d

Browse files
authored
Merge branch 'main' into upsert-bulk-transactions
2 parents 117b15e + 0159cdb commit 0c0a10d

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

.github/workflows/cicd.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
services:
1717
db_service:
18-
image: ghcr.io/stac-utils/pgstac:v0.7.1
18+
image: ghcr.io/stac-utils/pgstac:v0.7.10
1919
env:
2020
POSTGRES_USER: username
2121
POSTGRES_PASSWORD: password
@@ -39,7 +39,7 @@ jobs:
3939

4040
steps:
4141
- name: Check out repository code
42-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4343

4444
# Setup Python (faster than using Python container)
4545
- name: Setup Python
@@ -74,7 +74,7 @@ jobs:
7474
runs-on: ubuntu-latest
7575
services:
7676
pgstac:
77-
image: ghcr.io/stac-utils/pgstac:v0.7.1
77+
image: ghcr.io/stac-utils/pgstac:v0.7.10
7878
env:
7979
POSTGRES_USER: username
8080
POSTGRES_PASSWORD: password
@@ -92,7 +92,7 @@ jobs:
9292
- 5432:5432
9393
steps:
9494
- name: Check out repository code
95-
uses: actions/checkout@v3
95+
uses: actions/checkout@v4
9696
- name: Setup Python
9797
uses: actions/setup-python@v4
9898
with:
@@ -119,7 +119,7 @@ jobs:
119119
test-docs:
120120
runs-on: ubuntu-latest
121121
steps:
122-
- uses: actions/checkout@v3
122+
- uses: actions/checkout@v4
123123
- name: Setup Python
124124
uses: actions/setup-python@v4
125125
with:

.github/workflows/packages.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ jobs:
1515
packages: write
1616
steps:
1717
- name: Checkout repository
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
- name: Log in to the Container registry
20-
uses: docker/login-action@v2.2.0
20+
uses: docker/login-action@v3.0.0
2121
with:
2222
registry: ghcr.io
2323
username: ${{ github.actor }}
2424
password: ${{ secrets.GITHUB_TOKEN }}
2525
- name: Extract metadata (tags, labels) for Docker
2626
id: meta
27-
uses: docker/metadata-action@v4.6.0
27+
uses: docker/metadata-action@v5.0.0
2828
with:
2929
images: ghcr.io/stac-utils/stac-fastapi-pgstac
3030
- name: Build and push Docker image
31-
uses: docker/build-push-action@v4.1.1
31+
uses: docker/build-push-action@v5.0.0
3232
with:
3333
context: .
3434
file: Dockerfile

.github/workflows/pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Checkout main
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626
- name: Setup Pages
2727
uses: actions/configure-pages@v3
2828
- name: Set up Python 3.10

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: release
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- name: Set up Python 3.x
1515
uses: actions/setup-python@v4
1616
with:

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ services:
3333

3434
database:
3535
container_name: stac-db
36-
image: ghcr.io/stac-utils/pgstac:v0.7.9
36+
image: ghcr.io/stac-utils/pgstac:v0.7.10
3737
environment:
3838
- POSTGRES_USER=username
3939
- POSTGRES_PASSWORD=password

tests/resources/test_item.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -758,10 +758,10 @@ async def test_item_search_get_query_extension(
758758
)
759759

760760

761-
async def test_item_search_get_filter_extension_cql(
761+
async def test_item_search_post_filter_extension_cql(
762762
app_client, load_test_data, load_test_collection
763763
):
764-
"""Test GET search with JSONB query (cql json filter extension)"""
764+
"""Test POST search with JSONB query (cql json filter extension)"""
765765
test_item = load_test_data("test_item.json")
766766
resp = await app_client.post(
767767
f"/collections/{test_item['collection']}/items", json=test_item
@@ -808,10 +808,10 @@ async def test_item_search_get_filter_extension_cql(
808808
)
809809

810810

811-
async def test_item_search_get_filter_extension_cql2(
811+
async def test_item_search_post_filter_extension_cql2(
812812
app_client, load_test_data, load_test_collection
813813
):
814-
"""Test GET search with JSONB query (cql2 json filter extension)"""
814+
"""Test POST search with JSONB query (cql2 json filter extension)"""
815815
test_item = load_test_data("test_item.json")
816816
resp = await app_client.post(
817817
f"/collections/{test_item['collection']}/items", json=test_item
@@ -862,10 +862,10 @@ async def test_item_search_get_filter_extension_cql2(
862862
)
863863

864864

865-
async def test_item_search_get_filter_extension_cql2_with_query_fails(
865+
async def test_item_search_post_filter_extension_cql2_with_query_fails(
866866
app_client, load_test_data, load_test_collection
867867
):
868-
"""Test GET search with JSONB query (cql2 json filter extension)"""
868+
"""Test POST search with JSONB query (cql2 json filter extension)"""
869869
test_item = load_test_data("test_item.json")
870870
resp = await app_client.post(
871871
f"/collections/{test_item['collection']}/items", json=test_item
@@ -1285,10 +1285,10 @@ async def test_preserves_extra_link(
12851285
assert extra_link[0]["href"] == expected_href
12861286

12871287

1288-
async def test_item_search_get_filter_extension_cql_explicitlang(
1288+
async def test_item_search_post_filter_extension_cql_explicitlang(
12891289
app_client, load_test_data, load_test_collection
12901290
):
1291-
"""Test GET search with JSONB query (cql json filter extension)"""
1291+
"""Test POST search with JSONB query (cql json filter extension)"""
12921292
test_item = load_test_data("test_item.json")
12931293
resp = await app_client.post(
12941294
f"/collections/{test_item['collection']}/items", json=test_item
@@ -1331,10 +1331,10 @@ async def test_item_search_get_filter_extension_cql_explicitlang(
13311331
)
13321332

13331333

1334-
async def test_item_search_get_filter_extension_cql2_2(
1334+
async def test_item_search_post_filter_extension_cql2_2(
13351335
app_client, load_test_data, load_test_collection
13361336
):
1337-
"""Test GET search with JSONB query (cql json filter extension)"""
1337+
"""Test POST search with JSONB query (cql json filter extension)"""
13381338
test_item = load_test_data("test_item.json")
13391339
resp = await app_client.post(
13401340
f"/collections/{test_item['collection']}/items", json=test_item
@@ -1421,7 +1421,7 @@ async def test_search_datetime_validation_errors(app_client):
14211421
assert resp.status_code == 400
14221422

14231423

1424-
async def test_filter_cql2text(app_client, load_test_data, load_test_collection):
1424+
async def test_get_filter_cql2text(app_client, load_test_data, load_test_collection):
14251425
"""Test GET search with cql2-text"""
14261426
test_item = load_test_data("test_item.json")
14271427
resp = await app_client.post(

0 commit comments

Comments
 (0)