add sqlalchemy backend

.github/dependabot.yml

@@ -8,26 +8,6 @@ updates:
     directory: "/.github/workflows"
     schedule:
       interval: weekly
-  - package-ecosystem: pip
-    directory: "/stac_fastapi/api"
-    schedule:
-      interval: weekly
-  - package-ecosystem: pip
-    directory: "/stac_fastapi/api"
-    schedule:
-      interval: weekly
-  - package-ecosystem: pip
-    directory: "/stac_fastapi/types"
-    schedule:
-      interval: weekly
-  - package-ecosystem: pip
-    directory: "/stac_fastapi/extensions"
-    schedule:
-      interval: weekly
-  - package-ecosystem: pip
-    directory: "/stac_fastapi/pgstac"
-    schedule:
-      interval: weekly
   - package-ecosystem: pip
     directory: "/stac_fastapi/sqlalchemy"
     schedule:

.github/workflows/cicd.yaml

@@ -1,9 +1,9 @@
-name: stac-fastapi
+name: stac-fastapi-sqlalchemy
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   test:
@@ -46,33 +46,13 @@ jobs:
       - name: Lint code
         uses: pre-commit/[email protected]
 
-      - name: Install pipenv
+      - name: Install sqlalchemy backend
         run: |
-          python -m pip install --upgrade pipenv wheel
-
-      - name: Install types
-        run: |
-          pip install ./stac_fastapi/types[dev]
-
-      - name: Install core api
-        run: |
-          pip install ./stac_fastapi/api[dev]
-
-      - name: Install Extensions
-        run: |
-          pip install ./stac_fastapi/extensions[dev]
-
-      - name: Install sqlalchemy stac-fastapi
-        run: |
-          pip install ./stac_fastapi/sqlalchemy[dev,server]
-
-      - name: Install pgstac stac-fastapi
-        run: |
-          pip install ./stac_fastapi/pgstac[dev,server]
+          pip install .[dev,server]
 
       - name: Run migration
         run: |
-          cd stac_fastapi/sqlalchemy && alembic upgrade head
+          alembic upgrade head
         env:
           POSTGRES_USER: username
           POSTGRES_PASS: password
@@ -82,19 +62,7 @@ jobs:
 
       - name: Run test suite
         run: |
-          cd stac_fastapi/api && pipenv run pytest -svvv
-        env:
-          ENVIRONMENT: testing
-
-      - name: Run test suite
-        run: |
-          cd stac_fastapi/types && pipenv run pytest -svvv
-        env:
-          ENVIRONMENT: testing
-
-      - name: Run test suite
-        run: |
-          cd stac_fastapi/sqlalchemy && pipenv run pytest -svvv
+          pytest -svvv
         env:
           ENVIRONMENT: testing
           POSTGRES_USER: username
@@ -104,17 +72,6 @@ jobs:
           POSTGRES_HOST_WRITER: localhost
           POSTGRES_PORT: 5432
 
-      - name: Run test suite
-        run: |
-          cd stac_fastapi/pgstac && pipenv run pytest -svvv
-        env:
-          ENVIRONMENT: testing
-          POSTGRES_USER: username
-          POSTGRES_PASS: password
-          POSTGRES_DBNAME: postgis
-          POSTGRES_HOST_READER: localhost
-          POSTGRES_HOST_WRITER: localhost
-          POSTGRES_PORT: 5432
   test-docs:
     runs-on: ubuntu-latest
     steps:

.github/workflows/deploy_mkdocs.yml

@@ -3,7 +3,7 @@ name: Publish docs via GitHub Pages
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       # Rebuild website when docs have changed or code has changed
       - 'README.md'
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout master
+      - name: Checkout main
         uses: actions/checkout@v3
 
       - name: Set up Python 3.8
@@ -27,12 +27,9 @@ jobs:
 
       - name: Install dependencies
         run: |
+          sudo apt-get install -y postgresql libpq-dev
           python -m pip install --upgrade pip
-          python -m pip install -e \
-            stac_fastapi/api \
-            stac_fastapi/types \
-            stac_fastapi/extensions \
-            stac_fastapi/sqlalchemy
+          python -m pip install -e .
           python -m pip install mkdocs mkdocs-material pdocs
 
       - name: update API docs

Dockerfile

@@ -4,7 +4,7 @@ FROM python:3.8-slim as base
 # need the following packages in order to build
 RUN apt-get update && \
     apt-get -y upgrade && \
-    apt-get install -y build-essential git && \
+    apt-get install -y build-essential git postgresql libpq-dev && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -16,8 +16,4 @@ WORKDIR /app
 
 COPY . /app
 
-RUN pip install -e ./stac_fastapi/types[dev] && \
-    pip install -e ./stac_fastapi/api[dev] && \
-    pip install -e ./stac_fastapi/extensions[dev] && \
-    pip install -e ./stac_fastapi/sqlalchemy[dev,server] && \
-    pip install -e ./stac_fastapi/pgstac[dev,server]
+RUN pip install -e .[dev,server]

Dockerfile.docs

@@ -1,7 +1,7 @@
 FROM python:3.8-slim
 
 # build-essential is required to build a wheel for ciso8601
-RUN apt update && apt install -y build-essential
+RUN apt update && apt install -y build-essential postgresql libpq-dev
 
 RUN python -m pip install --upgrade pip
 RUN python -m pip install mkdocs mkdocs-material pdocs
@@ -10,16 +10,12 @@ COPY . /opt/src
 
 WORKDIR /opt/src
 
-RUN python -m pip install \
-    stac_fastapi/api \
-    stac_fastapi/types \
-    stac_fastapi/extensions \
-    stac_fastapi/sqlalchemy
+RUN python -m pip install .
 
 CMD ["pdocs", \
      "as_markdown", \
      "--output_dir", \
      "docs/api/", \
      "--exclude_source", \
      "--overwrite", \
-     "stac_fastapi"]
+     "stac_fastapi.sqlalchemy"]

Makefile

@@ -2,17 +2,11 @@
 APP_HOST ?= 0.0.0.0
 APP_PORT ?= 8080
 EXTERNAL_APP_PORT ?= ${APP_PORT}
-run_sqlalchemy = docker-compose run --rm \
+run_container = docker-compose run --rm \
 				-p ${EXTERNAL_APP_PORT}:${APP_PORT} \
 				-e APP_HOST=${APP_HOST} \
 				-e APP_PORT=${APP_PORT} \
-				app-sqlalchemy
-
-run_pgstac = docker-compose run --rm \
-				-p ${EXTERNAL_APP_PORT}:${APP_PORT} \
-				-e APP_HOST=${APP_HOST} \
-				-e APP_PORT=${APP_PORT} \
-				app-pgstac
+				stac-fastapi
 
 .PHONY: image
 image:
@@ -22,70 +16,40 @@ image:
 docker-run-all:
 	docker-compose up
 
-.PHONY: docker-run-sqlalchemy
-docker-run-sqlalchemy: image
-	$(run_sqlalchemy)
+.PHONY: docker-run
+docker-run: image
+	$(run_container)
 
-.PHONY: docker-run-pgstac
-docker-run-pgstac: image
-	$(run_pgstac)
+.PHONY: docker-shell
+docker-shell:
+	$(run_container) /bin/bash
 
-.PHONY: docker-shell-sqlalchemy
-docker-shell-sqlalchemy:
-	$(run_sqlalchemy) /bin/bash
 
-.PHONY: docker-shell-pgstac
-docker-shell-pgstac:
-	$(run_pgstac) /bin/bash
-
-.PHONY: test-sqlalchemy
-test-sqlalchemy: run-joplin-sqlalchemy
-	$(run_sqlalchemy) /bin/bash -c 'export && ./scripts/wait-for-it.sh database:5432 && cd /app/stac_fastapi/sqlalchemy/tests/ && pytest -vvv'
-
-.PHONY: test-pgstac
-test-pgstac:
-	$(run_pgstac) /bin/bash -c 'export && ./scripts/wait-for-it.sh database:5432 && cd /app/stac_fastapi/pgstac/tests/ && pytest -vvv'
+.PHONY: test
+test: run-joplin
+	$(run_container) /bin/bash -c 'export && ./scripts/wait-for-it.sh database:5432 && pytest -vvv'
 
-.PHONY: test-api
-test-api:
-	$(run_sqlalchemy) /bin/bash -c 'cd /app/stac_fastapi/api && pytest -svvv'
 
 .PHONY: run-database
 run-database:
 	docker-compose run --rm database
 
-.PHONY: run-joplin-sqlalchemy
-run-joplin-sqlalchemy:
-	docker-compose run --rm loadjoplin-sqlalchemy
-
-.PHONY: run-joplin-pgstac
-run-joplin-pgstac:
-	docker-compose run --rm loadjoplin-pgstac
-
-.PHONY: test
-test: test-sqlalchemy test-pgstac
-
-.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]
-
-.PHONY: pgstac-install
-pgstac-install: pybase-install
-	pip install -e ./stac_fastapi/pgstac[dev,server]
-
-.PHONY: sqlalchemy-install
-sqlalchemy-install: pybase-install
-	pip install -e ./stac_fastapi/sqlalchemy[dev,server]
+.PHONY: run-joplin
+run-joplin:
+	docker-compose run --rm load-joplin
 
 .PHONY: docs-image
 docs-image:
-	docker-compose -f docker-compose.docs.yml \
-		build
+	docker build . -f Dockerfile.docs -t stac-fastapi-sqlalchemy-docs:latest
 
 .PHONY: docs
 docs: docs-image
-	docker-compose -f docker-compose.docs.yml \
-		run docs
+	docker run --rm \
+		-v ${CURDIR}/:/opt/src \
+		-e POSTGRES_USER=username \
+		-e POSTGRES_PASS=password \
+		-e POSTGRES_DBNAME=postgis \
+		-e POSTGRES_HOST_READER=database \
+		-e POSTGRES_HOST_WRITER=database \
+		-e POSTGRES_PORT=5432 \
+		stac-fastapi-sqlalchemy-docs:latest