work mongo

Author: jonhealy1

.DS_Store

@@ -17,7 +17,4 @@ COPY . /app
 ENV PATH=$PATH:/install/bin
 
 RUN mkdir -p /install && \
-    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/mongo[dev,server]

Dockerfile.mongo

@@ -2,18 +2,6 @@
 APP_HOST ?= 0.0.0.0
 APP_PORT ?= 8080
 EXTERNAL_APP_PORT ?= ${APP_PORT}
-run_docker = 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
-
 run_mongo = docker-compose -f docker-compose.mongo.yml \
 				run \
 				-p ${EXTERNAL_APP_PORT}:${APP_PORT} \
@@ -22,66 +10,26 @@ run_mongo = docker-compose -f docker-compose.mongo.yml \
 				-e APP_PORT=${APP_PORT} \
 				app-mongo
 
-.PHONY: image
-image:
-	docker-compose build
-
 .PHONY: mongo-image
 mongo-image:
 	docker-compose -f docker-compose.mongo.yml build
 
-.PHONY: docker-run
-docker-run: image
-	$(run_docker)
-
-.PHONY: docker-run-pgstac
-docker-run-pgstac: image
-	$(run_pgstac)
-
 .PHONY: docker-run-mongo
 docker-run-mongo: mongo-image
 	$(run_mongo)
 
-.PHONY: docker-shell
-docker-shell:
-	$(run_docker) /bin/bash
-
-.PHONY: docker-shell-pgstac
-docker-shell-pgstac:
-	$(run_pgstac) /bin/bash
-
 .PHONY: docker-shell-mongo
 docker-shell-mongo:
 	$(run_mongo) /bin/bash
 
-.PHONY: test-sqlalchemy
-test-sqlalchemy: run-joplin-sqlalchemy
-	$(run_docker) /bin/bash -c 'export && ./scripts/wait-for-it.sh database:5432 && cd /app/stac_fastapi/sqlalchemy/tests/ && pytest'
-
-.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'
-
 .PHONY: test-mongo
 test-mongo:
 	$(run_mongo) /bin/bash -c 'export && cd /app/stac_fastapi/mongo/tests/ && pytest'
 
-.PHONY: run-database
-run-database:
-	docker-compose run --rm database
-
 .PHONY: run-mongo-database
 run-mongo-database:
 	docker-compose -f docker-compose.mongo.yml run --rm mongo_db
 
-.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 test-mongo
 
@@ -92,14 +40,6 @@ pybase-install:
 	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: mongo-install
 mongo-install: pybase-install
 	pip install -e ./stac_fastapi/mongo[dev,server]

Makefile

@@ -0,0 +1,73 @@
+#!/bin/bash
+
+set -e
+
+if [[ -n "${CI}" ]]; then
+    set -x
+fi
+
+# Import shared variables
+SUBPACKAGE_DIRS=(
+    "stac_fastapi/types"
+    "stac_fastapi/extensions"
+    "stac_fastapi/api"
+    "stac_fastapi/sqlalchemy"
+    "stac_fastapi/pgstac"
+    "stac_fastapi/mongo"
+)
+
+function usage() {
+    echo -n \
+        "Usage: $(basename "$0")
+Publish all stac-fastapi packages.
+
+Options:
+--test    Publish to test pypi. Requires a 'testpypi' repository
+          be defined in your .pypirc;
+          See https://packaging.python.org/guides/using-testpypi/#using-testpypi-with-pip
+"
+}
+
+POSITIONAL=()
+while [[ $# -gt 0 ]]
+do
+    key="$1"
+    case $key in
+
+        --help)
+        usage
+        exit 0
+        shift
+        ;;
+
+        --test)
+        TEST_PYPI="--repository testpypi"
+        shift
+        ;;
+
+        *)    # unknown option
+        POSITIONAL+=("$1") # save it in an array for later
+        shift # past argument
+        ;;
+    esac
+done
+set -- "${POSITIONAL[@]}" # restore positional parameters
+
+# Fail if this isn't CI and we aren't publishing to test pypi
+if [ -z "${TEST_PYPI}" ] && [ -z "${CI}" ]; then
+    echo "Only CI can publish to pypi"
+    exit 1
+fi
+
+if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
+    for PACKAGE_DIR in "${SUBPACKAGE_DIRS[@]}"
+    do
+        echo ${PACKAGE_DIR}
+        pushd ./${PACKAGE_DIR}
+        rm -rf dist
+        python setup.py sdist bdist_wheel
+        twine upload ${TEST_PYPI} dist/*
+        popd
+
+    done
+fi

scripts/publish

@@ -0,0 +1,186 @@
+#!/usr/bin/env bash
+# Use this script to test if a given TCP host/port are available
+
+######################################################
+# Copied from https://github.com/vishnubob/wait-for-it
+######################################################
+
+WAITFORIT_cmdname=${0##*/}
+
+echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
+
+usage()
+{
+    cat << USAGE >&2
+Usage:
+    $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
+    -h HOST | --host=HOST       Host or IP under test
+    -p PORT | --port=PORT       TCP port under test
+                                Alternatively, you specify the host and port as host:port
+    -s | --strict               Only execute subcommand if the test succeeds
+    -q | --quiet                Don't output any status messages
+    -t TIMEOUT | --timeout=TIMEOUT
+                                Timeout in seconds, zero for no timeout
+    -- COMMAND ARGS             Execute command with args after the test finishes
+USAGE
+    exit 1
+}
+
+wait_for()
+{
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    else
+        echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
+    fi
+    WAITFORIT_start_ts=$(date +%s)
+    while :
+    do
+        if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
+            nc -z $WAITFORIT_HOST $WAITFORIT_PORT
+            WAITFORIT_result=$?
+        else
+            (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
+            WAITFORIT_result=$?
+        fi
+        if [[ $WAITFORIT_result -eq 0 ]]; then
+            WAITFORIT_end_ts=$(date +%s)
+            echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
+            break
+        fi
+        sleep 1
+    done
+    return $WAITFORIT_result
+}
+
+wait_for_wrapper()
+{
+    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
+    if [[ $WAITFORIT_QUIET -eq 1 ]]; then
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    else
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    fi
+    WAITFORIT_PID=$!
+    trap "kill -INT -$WAITFORIT_PID" INT
+    wait $WAITFORIT_PID
+    WAITFORIT_RESULT=$?
+    if [[ $WAITFORIT_RESULT -ne 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    fi
+    return $WAITFORIT_RESULT
+}
+
+# process arguments
+while [[ $# -gt 0 ]]
+do
+    case "$1" in
+        *:* )
+        WAITFORIT_hostport=(${1//:/ })
+        WAITFORIT_HOST=${WAITFORIT_hostport[0]}
+        WAITFORIT_PORT=${WAITFORIT_hostport[1]}
+        shift 1
+        ;;
+        --child)
+        WAITFORIT_CHILD=1
+        shift 1
+        ;;
+        -q | --quiet)
+        WAITFORIT_QUIET=1
+        shift 1
+        ;;
+        -s | --strict)
+        WAITFORIT_STRICT=1
+        shift 1
+        ;;
+        -h)
+        WAITFORIT_HOST="$2"
+        if [[ $WAITFORIT_HOST == "" ]]; then break; fi
+        shift 2
+        ;;
+        --host=*)
+        WAITFORIT_HOST="${1#*=}"
+        shift 1
+        ;;
+        -p)
+        WAITFORIT_PORT="$2"
+        if [[ $WAITFORIT_PORT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --port=*)
+        WAITFORIT_PORT="${1#*=}"
+        shift 1
+        ;;
+        -t)
+        WAITFORIT_TIMEOUT="$2"
+        if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --timeout=*)
+        WAITFORIT_TIMEOUT="${1#*=}"
+        shift 1
+        ;;
+        --)
+        shift
+        WAITFORIT_CLI=("$@")
+        break
+        ;;
+        --help)
+        usage
+        ;;
+        *)
+        echoerr "Unknown argument: $1"
+        usage
+        ;;
+    esac
+done
+
+if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
+    echoerr "Error: you need to provide a host and port to test."
+    usage
+fi
+
+WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
+WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
+WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
+WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
+
+# Check to see if timeout is from busybox?
+WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
+WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+
+WAITFORIT_BUSYTIMEFLAG=""
+if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
+    WAITFORIT_ISBUSY=1
+    # Check if busybox timeout uses -t flag
+    # (recent Alpine versions don't support -t anymore)
+    if timeout &>/dev/stdout | grep -q -e '-t '; then
+        WAITFORIT_BUSYTIMEFLAG="-t"
+    fi
+else
+    WAITFORIT_ISBUSY=0
+fi
+
+if [[ $WAITFORIT_CHILD -gt 0 ]]; then
+    wait_for
+    WAITFORIT_RESULT=$?
+    exit $WAITFORIT_RESULT
+else
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        wait_for_wrapper
+        WAITFORIT_RESULT=$?
+    else
+        wait_for
+        WAITFORIT_RESULT=$?
+    fi
+fi
+
+if [[ $WAITFORIT_CLI != "" ]]; then
+    if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
+        echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
+        exit $WAITFORIT_RESULT
+    fi
+    exec "${WAITFORIT_CLI[@]}"
+else
+    exit $WAITFORIT_RESULT
+fi

scripts/wait-for-it.sh

@@ -9,11 +9,12 @@
     "attrs",
     "pydantic[dotenv]",
     "stac_pydantic==2.0.*",
-    "stac-fastapi.types",
-    "stac-fastapi.api",
-    "stac-fastapi.extensions",
+    "stac-fastapi.types==2.3.0",
+    "stac-fastapi.api==2.3.0",
+    "stac-fastapi.extensions==2.3.0",
     "fastapi-utils",
     "pymongo",
+    "pystac[validation]"
 ]
 
 extra_reqs = {