fix: resolve merge conflicts

Author: Yuri Zmytrakov

.github/workflows/publish.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Install build dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install setuptools wheel twine
+          pip install build twine
 
       - name: Build and publish stac-fastapi-core
         working-directory: stac_fastapi/core
@@ -30,7 +30,7 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: |
           # Build package
-          python setup.py sdist bdist_wheel
+          python -m build
 
           # Publish to PyPI
           twine upload dist/*
@@ -42,7 +42,7 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: |
           # Build package
-          python setup.py sdist bdist_wheel
+          python -m build
   
           # Publish to PyPI
           twine upload dist/*
@@ -54,7 +54,7 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: |
           # Build package
-          python setup.py sdist bdist_wheel
+          python -m build
 
           # Publish to PyPI
           twine upload dist/*
@@ -66,7 +66,7 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: |
           # Build package
-          python setup.py sdist bdist_wheel
+          python -m build
 
           # Publish to PyPI
           twine upload dist/*

CHANGELOG.md

@@ -9,6 +9,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+### Changed
+
+### Fixed
+
+### Removed
+
+### Updated
+
+
+## [v6.6.0] - 2025-10-21
+
+### Added
+
 - Spatial search support for collections via `bbox` parameter on `/collections` endpoint. Collections are now indexed with a `bbox_shape` field (GeoJSON polygon) derived from their spatial extent for efficient geospatial queries when created or updated. [#481](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/481
 - Introduced SFEOS Tools (`sfeos_tools/`) - An installable Click-based CLI package for managing SFEOS deployments. Initial command `add-bbox-shape` adds the `bbox_shape` field to existing collections for spatial search compatibility. Install with `pip install sfeos-tools[elasticsearch]` or `pip install sfeos-tools[opensearch]`. [#481](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/481)
 - Moved SFEOS Tools to its own repository at [Healy-Hyperspatial/sfeos-tools](https://github.com/Healy-Hyperspatial/sfeos-tools). The CLI package is now maintained separately. [#PR_NUMBER]
@@ -22,6 +35,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Removed ENV_MAX_LIMIT environment variable; maximum limits are now handled by the default global limit environment variable. [#482](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/482)
 - Changed the default and maximum pagination limits for collections/items endpoints. [#482](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/482)
 - Removed the `rel=child` links to the collections from the landing page, as the listing was incomplete due to pagination. [#496](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/496)
+- Changed to pyproject.toml file from setup.py [#505](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/505)
 
 ### Fixed
 
@@ -577,7 +591,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Use genexp in execute_search and get_all_collections to return results.
 - Added db_to_stac serializer to item_collection method in core.py.
 
-[Unreleased]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.5.1...main
+[Unreleased]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.6.0...main
+[v6.6.0]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.5.1...v6.6.0
 [v6.5.1]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.5.0...v6.5.1
 [v6.5.0]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.4.0...v6.5.0
 [v6.4.0]: https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/compare/v6.3.0...v6.4.0

stac_fastapi/core/README.md

@@ -0,0 +1,20 @@
+# stac-fastapi-core
+
+Core functionality for stac-fastapi. For full documentation, please see the [main README](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/blob/main/README.md).
+
+## Package Information
+
+- **Package name**: stac-fastapi-core
+- **Description**: Core functionality for STAC API implementations.
+- **Documentation**: [https://stac-utils.github.io/stac-fastapi-elasticsearch-opensearch/](https://stac-utils.github.io/stac-fastapi-elasticsearch-opensearch/)
+- **Source**: [GitHub Repository](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/)
+
+## Installation
+
+```bash
+pip install stac-fastapi-core
+```
+
+## Quick Start
+
+For detailed usage and examples, please refer to the [main documentation](https://stac-utils.github.io/stac-fastapi-elasticsearch-opensearch/).

stac_fastapi/core/README.md

@@ -0,0 +1,60 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "stac_fastapi_core"
+description = "Core library for the Elasticsearch and Opensearch stac-fastapi backends."
+readme = "README.md"
+requires-python = ">=3.9"
+license = {text = "MIT"}
+authors = []
+classifiers = [
+    "Intended Audience :: Developers",
+    "Intended Audience :: Information Technology",
+    "Intended Audience :: Science/Research",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "License :: OSI Approved :: MIT License",
+]
+keywords = [
+    "STAC",
+    "STAC-API",
+    "FastAPI",
+    "stac-fastapi",
+    "Elasticsearch",
+    "Opensearch",
+]
+dynamic = ["version"]
+dependencies = [
+    "fastapi~=0.109.0",
+    "attrs>=23.2.0",
+    "pydantic>=2.4.1,<3.0.0",
+    "stac_pydantic~=3.3.0",
+    "stac-fastapi.types==6.0.0",
+    "stac-fastapi.api==6.0.0",
+    "stac-fastapi.extensions==6.0.0",
+    "orjson~=3.11.0",
+    "overrides~=7.4.0",
+    "geojson-pydantic~=1.0.0",
+    "pygeofilter~=0.3.1",
+    "jsonschema~=4.0.0",
+    "slowapi~=0.1.9",
+    "redis==6.4.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch"
+
+[tool.hatch.version]
+path = "stac_fastapi/core/version.py"
+
+[tool.hatch.build.targets.sdist]
+exclude = ["alembic", "tests", "scripts"]
+
+[tool.hatch.build.targets.wheel]
+only-include = ["stac_fastapi"]

stac_fastapi/core/pyproject.toml

@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "6.5.1"
+__version__ = "6.6.0"

stac_fastapi/core/setup.cfg

@@ -0,0 +1,20 @@
+# stac-fastapi-elasticsearch
+
+This is the Elasticsearch backend for stac-fastapi. For full documentation, please see the [main README](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/blob/main/README.md).
+
+## Package Information
+
+- **Package name**: stac-fastapi-elasticsearch
+- **Description**: An implementation of STAC API based on the FastAPI framework with Elasticsearch.
+- **Documentation**: [https://stac-utils.github.io/stac-fastapi-elasticsearch-opensearch/](https://stac-utils.github.io/stac-fastapi-elasticsearch-opensearch/)
+- **Source**: [GitHub Repository](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/)
+
+## Installation
+
+```bash
+pip install stac-fastapi-elasticsearch
+```
+
+## Quick Start
+
+For detailed usage and examples, please refer to the [main documentation](https://stac-utils.github.io/stac-fastapi-elasticsearch-opensearch/).

stac_fastapi/core/stac_fastapi/core/version.py

@@ -0,0 +1,71 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "stac_fastapi_elasticsearch"
+description = "An implementation of STAC API based on the FastAPI framework with Elasticsearch."
+readme = "README.md"
+requires-python = ">=3.9"
+license = {text = "MIT"}
+authors = []
+classifiers = [
+    "Intended Audience :: Developers",
+    "Intended Audience :: Information Technology",
+    "Intended Audience :: Science/Research",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "License :: OSI Approved :: MIT License",
+]
+keywords = [
+    "STAC",
+    "STAC-API",
+    "FastAPI",
+    "Elasticsearch",
+    "stac-fastapi",
+]
+dynamic = ["version"]
+dependencies = [
+    "stac-fastapi-core==6.6.0",
+    "sfeos-helpers==6.6.0",
+    "elasticsearch[async]~=8.19.1",
+    "uvicorn~=0.23.0",
+    "starlette>=0.35.0,<0.36.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch"
+
+[project.optional-dependencies]
+dev = [
+    "pytest~=8.0",
+    "pytest-cov~=4.0.0",
+    "pytest-asyncio~=0.21.0",
+    "pre-commit~=3.0.0",
+    "ciso8601~=2.3.0",
+    "httpx>=0.24.0,<0.28.0",
+]
+docs = [
+    "mkdocs~=1.4.0",
+    "mkdocs-material~=9.0.0",
+    "pdocs~=1.2.0",
+]
+server = [
+    "uvicorn[standard]~=0.23.0",
+]
+
+[project.scripts]
+stac-fastapi-elasticsearch = "stac_fastapi.elasticsearch.app:run"
+
+[tool.hatch.version]
+path = "stac_fastapi/elasticsearch/version.py"
+
+[tool.hatch.build.targets.sdist]
+exclude = ["alembic", "tests", "scripts"]
+
+[tool.hatch.build.targets.wheel]
+only-include = ["stac_fastapi"]