Merge pull request #202 from stac-utils/v2.1.0

v2.1.0
stac-utils · Mar 3, 2024 · f83d670 · f83d670
2 parents 67f6151 + 9e2d4ec
commit f83d670
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 85 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -1,4 +1,5 @@
 name: stac-fastapi-elasticsearch
+
 on:
   push:
     branches:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+### Changed
+
+### Fixed
+
+
+## [v2.1.0]
+
+### Added
+
 - Added explicit mapping for ID in `ES_COLLECTIONS_MAPPINGS` [#198](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/198)
 
 ### Changed
@@ -128,7 +137,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added db_to_stac serializer to item_collection method in core.py.
 
 
-[Unreleased]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v2.0.0...main>
+[Unreleased]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v2.1.0...main>
+[v2.1.0]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v2.0.0...v2.1.0>
 [v2.0.0]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v1.1.0...v2.0.0>
 [v1.1.0]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v1.0.0...v1.1.0>
 [v1.0.0]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v0.3.0...v1.0.0>

diff --git a/Makefile b/Makefile
@@ -28,11 +28,11 @@ run_os = docker-compose \
 
 .PHONY: image-deploy-es
 image-deploy-es:
-	docker build -f Dockerfile.dev.es -t stac-fastapi-elasticsearch:latest .
+	docker build -f dockerfiles/Dockerfile.dev.es -t stac-fastapi-elasticsearch:latest .
 
 .PHONY: image-deploy-os
 image-deploy-os:
-	docker build -f Dockerfile.dev.os -t stac-fastapi-opensearch:latest .
+	docker build -f dockerfiles/Dockerfile.dev.os -t stac-fastapi-opensearch:latest .
 
 .PHONY: run-deploy-locally
 run-deploy-locally:

diff --git a/README.md b/README.md
@@ -1,10 +1,13 @@
 # stac-fastapi-elasticsearch-opensearch (sfeos)
 
-## Elasticsearch and Opensearch backends for the stac-fastapi project
-
-[![PyPI version](https://badge.fury.io/py/stac-fastapi.elasticsearch.svg)](https://badge.fury.io/py/stac-fastapi.elasticsearch)
+## Elasticsearch and Opensearch backends for the stac-fastapi project  
+
+  [![PyPI version](https://badge.fury.io/py/stac-fastapi.elasticsearch.svg)](https://badge.fury.io/py/stac-fastapi.elasticsearch)  
+
+- Our Api core library can be used to create custom backends. See [stac-fastapi-mongo](https://github.com/Healy-Hyperspatial/stac-fastapi-mongo) for a working example.  
+- Reach out on our [Gitter](https://app.gitter.im/#/room/#stac-fastapi-elasticsearch_community:gitter.im) channel or feel free to add to our [Discussions](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/discussions) page here on github.
 
-To install from PyPI:
+### To install from PyPI:
 
 ```shell
 pip install stac_fastapi.elasticsearch

diff --git a/data_loader/data_loader.py b/data_loader/data_loader.py
@@ -13,6 +13,7 @@
 DATA_DIR = os.path.join(os.path.dirname(__file__), "setup_data/")
 
 backend = sys.argv[1].lower()
+
 if backend == "opensearch":
     STAC_API_BASE_URL = "http://localhost:8082"
 elif backend == "elasticsearch":

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     restart: always
     build:
       context: .
-      dockerfile: Dockerfile.dev.es
+      dockerfile: dockerfiles/Dockerfile.dev.es
     environment:
       - APP_HOST=0.0.0.0
       - APP_PORT=8080
@@ -36,7 +36,7 @@ services:
     restart: always
     build:
       context: .
-      dockerfile: Dockerfile.dev.os
+      dockerfile: dockerfiles/Dockerfile.dev.os
     environment:
       - APP_HOST=0.0.0.0
       - APP_PORT=8082

diff --git a/Dockerfile.deploy.es → dockerfiles/Dockerfile.deploy.es b/Dockerfile.deploy.es → dockerfiles/Dockerfile.deploy.es
diff --git a/Dockerfile.deploy.os → dockerfiles/Dockerfile.deploy.os b/Dockerfile.deploy.os → dockerfiles/Dockerfile.deploy.os
diff --git a/Dockerfile.dev.es → dockerfiles/Dockerfile.dev.es b/Dockerfile.dev.es → dockerfiles/Dockerfile.dev.es
diff --git a/Dockerfile.dev.os → dockerfiles/Dockerfile.dev.os b/Dockerfile.dev.os → dockerfiles/Dockerfile.dev.os
diff --git a/scripts/publish b/scripts/publish
diff --git a/stac_fastapi/core/stac_fastapi/core/version.py b/stac_fastapi/core/stac_fastapi/core/version.py
@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "2.0.0"
+__version__ = "2.1.0"
diff --git a/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/version.py b/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/version.py
@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "2.0.0"
+__version__ = "2.1.0"
diff --git a/stac_fastapi/opensearch/stac_fastapi/opensearch/version.py b/stac_fastapi/opensearch/stac_fastapi/opensearch/version.py
@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "2.0.0"
+__version__ = "2.1.0"