Removed requirements.txt to use setup.py

Author: kompotkot

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ jobs:
         with:
           python-version: "3.8"
       - name: Install test requirements
-        run: pip install -r requirements.txt
+        run: pip install -e .[dev]
       - name: Mypy type check
         run: mypy brood/
       - name: Black syntax check

deploy/deploy.monolith.bash

@@ -1,6 +1,17 @@
 #!/usr/bin/env bash
 
-# Deployment script - intended to run on Brood servers
+# Deployment script - intended to run on Brood API server
+
+# Colors
+C_RESET='\033[0m'
+C_RED='\033[1;31m'
+C_GREEN='\033[1;32m'
+C_YELLOW='\033[1;33m'
+
+# Logs
+PREFIX_INFO="${C_GREEN}[INFO]${C_RESET} [$(date +%d-%m\ %T)]"
+PREFIX_WARN="${C_YELLOW}[WARN]${C_RESET} [$(date +%d-%m\ %T)]"
+PREFIX_CRIT="${C_RED}[CRIT]${C_RESET} [$(date +%d-%m\ %T)]"
 
 # Main
 APP_DIR="${APP_DIR:-/home/ubuntu/brood}"
@@ -13,24 +24,31 @@ PARAMETERS_SCRIPT="${SCRIPT_DIR}/parameters.py"
 SECRETS_DIR="${SECRETS_DIR:-/home/ubuntu/brood-secrets}"
 PARAMETERS_ENV_PATH="${SECRETS_DIR}/app.env"
 AWS_SSM_PARAMETER_PATH="${AWS_SSM_PARAMETER_PATH:-/brood/prod}"
+
+# API server service file
 SERVICE_FILE="${SCRIPT_DIR}/brood.monolith.service"
 
 set -eu
 
 echo
 echo
-echo "Updating Python dependencies"
-"${PIP}" install -r "${APP_DIR}/requirements.txt"
+echo -e "${PREFIX_INFO} Upgrading Python pip and setuptools"
+"${PIP}" install --upgrade pip setuptools
+
+echo
+echo
+echo -e "${PREFIX_INFO} Installing Python dependencies"
+"${PIP}" install -e "${APP_BACKEND_DIR}/"
 
 echo
 echo
-echo "Retrieving deployment parameters"
+echo -e "${PREFIX_INFO} Retrieving deployment parameters"
 mkdir -p "${SECRETS_DIR}"
 AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION}" "${PYTHON}" "${PARAMETERS_SCRIPT}" "${AWS_SSM_PARAMETER_PATH}" -o "${PARAMETERS_ENV_PATH}"
 
 echo
 echo
-echo "Replacing existing Brood service definition with ${SERVICE_FILE}"
+echo -e "${PREFIX_INFO} Replacing existing Brood service definition with ${SERVICE_FILE}"
 chmod 644 "${SERVICE_FILE}"
 cp "${SERVICE_FILE}" /etc/systemd/system/brood.service
 systemctl daemon-reload

requirements.txt

@@ -11,18 +11,22 @@
     version=BROOD_VERSION,
     packages=find_packages(),
     install_requires=[
-        "fastapi",
-        "python-multipart",
-        "psycopg2-binary",
-        "alembic",
-        "sqlalchemy",
-        "uvicorn",
-        "sendgrid",
-        "passlib",
-        "argon2_cffi",
-        "stripe",
+        "argon2_cffi~=21.1.0",
+        "boto3~=1.20.2",
+        "fastapi~=0.70.0",
+        "passlib~=1.7.4",
+        "psycopg2-binary~=2.9.1",
+        "pydantic~=1.8.2",
+        "python-multipart~=0.0.5",
+        "sendgrid~=6.9.0",
+        "sqlalchemy~=1.4.26",
+        "stripe~=2.61.0",
+        "uvicorn~=0.15.0",
     ],
-    extras_require={"dev": ["black", "mypy", "boto3"]},
+    extras_require={
+        "dev": ["alembic", "black", "isort", "mypy"],
+        "distribute": ["setuptools", "twine", "wheel"],
+    },
     description="Brood: Bugout authentication",
     long_description=long_description,
     long_description_content_type="text/markdown",