Merge pull request #28 from bugout-dev/setup-requirements

Setup instead of requirements.txt

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

.github/workflows/release.yml

@@ -0,0 +1,25 @@
+name: Release Bugout Brood API package
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -e .[distribute]
+      - name: Build and publish
+        env:
+          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        run: |
+          python setup.py sdist bdist_wheel
+          twine upload dist/*

.isort.cfg

@@ -0,0 +1,3 @@
+[settings]
+profile = black
+multi_line_output = 3

deploy/deploy.bash

@@ -31,7 +31,7 @@ echo "Updating pip and setuptools"
 echo
 echo
 echo "Updating Python dependencies"
-"${PIP}" install -r "${APP_DIR}/requirements.txt"
+"${PIP}" install -e "${APP_DIR}/"
 
 echo
 echo

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_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

@@ -7,30 +7,38 @@
     long_description = ifp.read()
 
 setup(
-    name="brood",
+    name="bugout-brood",
     version=BROOD_VERSION,
     packages=find_packages(),
     install_requires=[
-        "fastapi",
-        "python-multipart",
+        "argon2_cffi",
+        "boto3>=1.20.2",
+        "fastapi>=0.70.0",
+        "passlib",
         "psycopg2-binary",
-        "alembic",
-        "sqlalchemy",
-        "uvicorn",
+        "pydantic",
+        "python-multipart",
         "sendgrid",
-        "passlib",
-        "argon2_cffi",
-        "stripe",
+        "sqlalchemy>=1.4.26",
+        "stripe>=2.61.0",
+        "uvicorn>=0.15.0",
     ],
-    extras_require={"dev": ["black", "mypy", "boto3"]},
+    extras_require={
+        "dev": ["alembic>=1.7.4", "black", "isort", "mypy"],
+        "distribute": ["setuptools", "twine", "wheel"],
+    },
     description="Brood: Bugout authentication",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    author="Neeraj Kashyap",
-    author_email="neeraj@simiotics.com",
+    author="Bugout.dev",
+    author_email="engineering@bugout.dev",
     classifiers=[
-        "Development Status :: 2 - Pre-Alpha",
+        "Development Status :: 3 - Alpha",
+        "Intended Audience :: Developers",
+        "Natural Language :: English",
         "Programming Language :: Python",
+        "License :: OSI Approved :: Apache Software License",
+        "Topic :: Software Development :: Libraries",
     ],
     url="https://github.com/simiotics/brood",
     entry_points={