workflow, pre-commit

stac-utils · Jan 31, 2024 · 653b9c4 · 653b9c4
1 parent 311fabd
commit 653b9c4
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -70,11 +70,11 @@ jobs:
 
       - name: Install elasticsearch stac-fastapi
         run: |
-          pip install ./stac_fastapi/elastic_search[dev,server]
+          pip install ./stac_api/elastic_search[dev,server]
 
       - name: Run test suite against Elasticsearch 7.x
         run: |
-          cd stac_fastapi/elastic_search && pipenv run pytest -svvv
+          cd stac_api && pipenv run pytest -svvv
         env:
           ENVIRONMENT: testing
           ES_PORT: 9200
@@ -84,7 +84,7 @@ jobs:
 
       - name: Run test suite against Elasticsearch 8.x
         run: |
-          cd stac_fastapi/elastic_search && pipenv run pytest -svvv
+          cd stac_api && pipenv run pytest -svvv
         env:
           ENVIRONMENT: testing
           ES_PORT: 9400

diff --git a/stac_api/__init__.py b/stac_api/__init__.py
@@ -0,0 +1 @@
+"""stac api."""
diff --git a/stac_api/elastic_search/app.py b/stac_api/elastic_search/app.py
@@ -1,8 +1,6 @@
 """FastAPI application."""
 import sys
 
-from stac_fastapi.api.app import StacApi
-from stac_fastapi.api.models import create_get_request_model, create_post_request_model
 from stac_api.common.core import (
     BulkTransactionsClient,
     CoreClient,
@@ -13,6 +11,8 @@
 from stac_api.elastic_search.config import ElasticsearchSettings
 from stac_api.elastic_search.database_logic import create_collection_index
 from stac_api.elastic_search.session import Session
+from stac_fastapi.api.app import StacApi
+from stac_fastapi.api.models import create_get_request_model, create_post_request_model
 from stac_fastapi.extensions.core import (
     ContextExtension,
     FieldsExtension,

diff --git a/stac_api/elastic_search/database_logic.py b/stac_api/elastic_search/database_logic.py
@@ -283,10 +283,10 @@ class DatabaseLogic:
     sync_client = SyncElasticsearchSettings().create_client
 
     item_serializer: Type[serializers.ItemSerializer] = attr.ib(
-        default=serializers.ItemSerializer # type: ignore
+        default=serializers.ItemSerializer  # type: ignore
     )
     collection_serializer: Type[serializers.CollectionSerializer] = attr.ib(
-        default=serializers.CollectionSerializer # type: ignore
+        default=serializers.CollectionSerializer  # type: ignore
     )
 
     """CORE LOGIC"""

diff --git a/stac_api/elastic_search/setup.py b/stac_api/elastic_search/setup.py
@@ -65,6 +65,8 @@
     tests_require=extra_reqs["dev"],
     extras_require=extra_reqs,
     entry_points={
-        "console_scripts": ["stac-fastapi-elasticsearch=stac_api.elastic_search.app:run"]
+        "console_scripts": [
+            "stac-fastapi-elasticsearch=stac_api.elastic_search.app:run"
+        ]
     },
 )
diff --git a/stac_api/tests/conftest.py b/stac_api/tests/conftest.py
@@ -10,18 +10,14 @@
 
 import pytest
 import pytest_asyncio
-from stac_api.elastic_search.config import AsyncElasticsearchSettings
-from stac_api.elastic_search.database_logic import create_collection_index
 from httpx import AsyncClient
 
+from stac_api.common.core import BulkTransactionsClient, CoreClient, TransactionsClient
+from stac_api.common.extensions import QueryExtension
+from stac_api.elastic_search.config import AsyncElasticsearchSettings
+from stac_api.elastic_search.database_logic import create_collection_index
 from stac_fastapi.api.app import StacApi
 from stac_fastapi.api.models import create_get_request_model, create_post_request_model
-from stac_api.common.core import (
-    BulkTransactionsClient,
-    CoreClient,
-    TransactionsClient,
-)
-from stac_api.common.extensions import QueryExtension
 from stac_fastapi.extensions.core import (  # FieldsExtension,
     ContextExtension,
     FieldsExtension,