update, clean dependencies

jonhealy1 · jonhealy1 · commit dff0a6cdfdaa · 2024-02-04T12:25:22.000+08:00
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -84,10 +84,6 @@ jobs:
         run: |
           python -m pip install --upgrade pipenv wheel
 
-      - name: Install core library stac-fastapi
-        run: |
-          pip install ./stac_fastapi/core
-
       - name: Install elasticsearch stac-fastapi
         run: |
           pip install ./stac_fastapi/elasticsearch[dev,server]
@@ -96,6 +92,10 @@ jobs:
         run: |
           pip install ./stac_fastapi/opensearch[dev,server]
 
+      - name: Install core library stac-fastapi
+        run: |
+          pip install ./stac_fastapi/core
+
       - name: Run test suite against Elasticsearch 7.x
         run: |
           cd stac_fastapi/elasticsearch && pipenv run pytest -svvv
diff --git a/examples/pip_docker/Dockerfile b/examples/pip_docker/Dockerfile
@@ -15,4 +15,4 @@ WORKDIR /app
 
 COPY . /app
 
-RUN pip install stac-fastapi.elasticsearch==0.3.0
+RUN pip install stac-fastapi.elasticsearch==1.1.0
diff --git a/examples/postman_collections/stac-fastapi-elasticsearch.postman_collection.json b/examples/postman_collections/stac-fastapi-elasticsearch.postman_collection.json
diff --git a/stac_fastapi/core/README.md b/stac_fastapi/core/README.md
@@ -0,0 +1 @@
+# stac-fastapi core library for Elasticsearch and Opensearch backends
diff --git a/stac_fastapi/core/setup.cfg b/stac_fastapi/core/setup.cfg
@@ -1,2 +1,2 @@
 [metadata]
-version = attr: stac_fastapi.core.version.__version__
+version = 0.1.0
diff --git a/stac_fastapi/elasticsearch/setup.py b/stac_fastapi/elasticsearch/setup.py
@@ -6,22 +6,11 @@
     desc = f.read()
 
 install_requires = [
-    "fastapi",
-    "attrs",
-    "pydantic[dotenv]<2",
-    "stac_pydantic==2.0.*",
-    "stac-fastapi.types==2.4.9",
-    "stac-fastapi.api==2.4.9",
-    "stac-fastapi.extensions==2.4.9",
+    "stac-fastapi.core==0.1.0",
     "elasticsearch[async]==8.11.0",
     "elasticsearch-dsl==8.11.0",
-    "pystac[validation]",
     "uvicorn",
-    "orjson",
-    "overrides",
     "starlette",
-    "geojson-pydantic",
-    "pygeofilter==0.2.1",
 ]
 
 extra_reqs = {
diff --git a/stac_fastapi/opensearch/README.md b/stac_fastapi/opensearch/README.md
@@ -0,0 +1 @@
+# stac-fastapi-opensearch 
diff --git a/stac_fastapi/opensearch/setup.cfg b/stac_fastapi/opensearch/setup.cfg
@@ -1,2 +1,2 @@
 [metadata]
-version = attr: stac_fastapi.core.version.__version__
+version = 0.1.0
diff --git a/stac_fastapi/opensearch/setup.py b/stac_fastapi/opensearch/setup.py
@@ -6,22 +6,11 @@
     desc = f.read()
 
 install_requires = [
-    "fastapi",
-    "attrs",
-    "pydantic[dotenv]<2",
-    "stac_pydantic==2.0.*",
-    "stac-fastapi.types==2.4.9",
-    "stac-fastapi.api==2.4.9",
-    "stac-fastapi.extensions==2.4.9",
+    "stac-fastapi.core==0.1.0",
     "opensearch-py==2.4.2",
     "opensearch-py[async]==2.4.2",
-    "pystac[validation]",
     "uvicorn",
-    "orjson",
-    "overrides",
     "starlette",
-    "geojson-pydantic",
-    "pygeofilter==0.2.1",
 ]
 
 extra_reqs = {

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@ WORKDIR /app`
`15`	`15`
`16`	`16`	`COPY . /app`
`17`	`17`
`18`		`-RUN pip install stac-fastapi.elasticsearch==0.3.0`
	`18`	`+RUN pip install stac-fastapi.elasticsearch==1.1.0`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# stac-fastapi core library for Elasticsearch and Opensearch backends`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[metadata]`
`2`		`-version = attr: stac_fastapi.core.version.__version__`
	`2`	`+version = 0.1.0`