Merge pull request #7 from Healy-Hyperspatial/reorg-setup

Reorg setup
Healy-Hyperspatial · Mar 10, 2024 · 8ccf263 · 8ccf263
2 parents a37f1f5 + 7bab232
commit 8ccf263
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Install stac-fastapi-mongo
         run: |
-          pip install ./stac_fastapi/mongo[dev,server]
+          pip install .[dev,server]
 
       - name: Run test suite against Mongo
         run: |

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,2 @@
+prune stac_fastapi/tests
+prune data_loader
diff --git a/Makefile b/Makefile
@@ -58,9 +58,6 @@ run-database-mongo:
 .PHONY: pybase-install
 pybase-install:
 	pip install wheel && \
-	pip install -e ./stac_fastapi/api[dev] && \
-	pip install -e ./stac_fastapi/types[dev] && \
-	pip install -e ./stac_fastapi/extensions[dev] && \
 	pip install -e ./stac_fastapi/core
 
 .PHONY: install-mongo

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ pip install stac_fastapi.mongo
 To install the classes in your local Python env, run:
 
 ```shell
-pip install -e 'stac_fastapi/mongo[dev]'
+pip install -e .[dev]
 ```
 
 

diff --git a/dockerfiles/Dockerfile.deploy.mongo b/dockerfiles/Dockerfile.deploy.mongo
@@ -12,7 +12,7 @@ WORKDIR /app
 
 COPY . /app
 
-RUN pip install --no-cache-dir ./stac_fastapi/mongo[server]
+RUN pip install --no-cache-dir .[server]
 
 EXPOSE 8080
 

diff --git a/dockerfiles/Dockerfile.dev.mongo b/dockerfiles/Dockerfile.dev.mongo
@@ -15,4 +15,4 @@ WORKDIR /app
 
 COPY . /app
 
-RUN pip install --no-cache-dir -e ./stac_fastapi/mongo[dev,server]
+RUN pip install --no-cache-dir -e .[dev,server]
diff --git a/stac_fastapi/mongo/setup.py → setup.py b/stac_fastapi/mongo/setup.py → setup.py
@@ -29,6 +29,7 @@
 
 setup(
     name="stac-fastapi.mongo",
+    version="3.0.0",
     description="Mongodb stac-fastapi backend.",
     long_description=desc,
     long_description_content_type="text/markdown",

diff --git a/stac_fastapi/mongo/README.md → stac_fastapi/README.md b/stac_fastapi/mongo/README.md → stac_fastapi/README.md
diff --git a/...tapi/mongo/stac_fastapi/mongo/__init__.py → stac_fastapi/mongo/__init__.py b/...tapi/mongo/stac_fastapi/mongo/__init__.py → stac_fastapi/mongo/__init__.py
diff --git a/stac_fastapi/mongo/stac_fastapi/mongo/app.py → stac_fastapi/mongo/app.py b/stac_fastapi/mongo/stac_fastapi/mongo/app.py → stac_fastapi/mongo/app.py
diff --git a/...astapi/mongo/stac_fastapi/mongo/config.py → stac_fastapi/mongo/config.py b/...astapi/mongo/stac_fastapi/mongo/config.py → stac_fastapi/mongo/config.py
diff --git a/...ongo/stac_fastapi/mongo/database_logic.py → stac_fastapi/mongo/database_logic.py b/...ongo/stac_fastapi/mongo/database_logic.py → stac_fastapi/mongo/database_logic.py
diff --git a/stac_fastapi/mongo/setup.cfg b/stac_fastapi/mongo/setup.cfg
diff --git a/stac_fastapi/mongo/stac_fastapi/mongo/version.py b/stac_fastapi/mongo/stac_fastapi/mongo/version.py
diff --git a/...api/mongo/stac_fastapi/mongo/utilities.py → stac_fastapi/mongo/utilities.py b/...api/mongo/stac_fastapi/mongo/utilities.py → stac_fastapi/mongo/utilities.py
diff --git a/stac_fastapi/mongo/pytest.ini → stac_fastapi/pytest.ini b/stac_fastapi/mongo/pytest.ini → stac_fastapi/pytest.ini