Release yml and removed requirements.txt

Author: kompotkot

.github/workflows/release.yml

@@ -0,0 +1,25 @@
+name: Release Bugout Spire 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/*

deploy/deploy.bash

@@ -2,6 +2,17 @@
 
 # Deployment script - intended to run on Spire servers
 
+# 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/app}"
 AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION:-us-east-1}"
@@ -33,9 +44,13 @@ set -eu
 
 echo
 echo
-echo "Updating Python dependencies"
-"${PIP}" install --upgrade pip
-"${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

deploy/deploy.monolith.bash

@@ -1,6 +1,17 @@
 #!/usr/bin/env bash
 
-# Deployment script - intended to run on Spire servers
+# Deployment script - intended to run on Spire 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/spire}"
@@ -27,19 +38,23 @@ set -eu
 
 echo
 echo
-echo "Updating Python dependencies"
-"${PIP}" install --upgrade pip
-"${PIP}" install --exists-action i -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 Spire service definition with ${SERVICE_FILE}"
+echo -e "${PREFIX_INFO} Replacing existing Spire service definition with ${SERVICE_FILE}"
 chmod 644 "${SERVICE_FILE}"
 cp "${SERVICE_FILE}" /etc/systemd/system/spire.service
 systemctl daemon-reload
@@ -49,7 +64,7 @@ systemctl status spire.service
 
 echo
 echo
-echo "Replacing existing Spire GitHub service and timer definitions with: ${TOKEN_SERVICE_FILE}, ${TOKEN_TIMER_FILE}"
+echo -e "${PREFIX_INFO} Replacing existing Spire GitHub service and timer definitions with: ${TOKEN_SERVICE_FILE}, ${TOKEN_TIMER_FILE}"
 chmod 644 "${TOKEN_SERVICE_FILE}" "${TOKEN_TIMER_FILE}"
 cp "${TOKEN_SERVICE_FILE}" /etc/systemd/system/spiregithubtoken.service
 cp "${TOKEN_TIMER_FILE}" /etc/systemd/system/spiregithubtoken.timer
@@ -60,7 +75,7 @@ systemctl start spiregithubtoken.timer
 
 echo
 echo
-echo "Replacing existing Spire Humbug tokens synchronization service and timer definitions with: ${HUMBUG_TOKENS_SERVICE_FILE}, ${HUMBUG_TOKENS_TIMER_FILE}"
+echo -e "${PREFIX_INFO} Replacing existing Spire Humbug tokens synchronization service and timer definitions with: ${HUMBUG_TOKENS_SERVICE_FILE}, ${HUMBUG_TOKENS_TIMER_FILE}"
 chmod 644 "${HUMBUG_TOKENS_SERVICE_FILE}" "${HUMBUG_TOKENS_TIMER_FILE}"
 cp "${HUMBUG_TOKENS_SERVICE_FILE}" /etc/systemd/system/spirehumbugtokens.service
 cp "${HUMBUG_TOKENS_TIMER_FILE}" /etc/systemd/system/spirehumbugtokens.timer

requirements.txt

@@ -2,14 +2,12 @@
 
 from spire.version import SPIRE_VERSION
 
-MODULE_NAME = "spire"
-
 long_description = ""
 with open("README.md") as ifp:
     long_description = ifp.read()
 
 setup(
-    name=MODULE_NAME,
+    name="bugout-spire",
     version=SPIRE_VERSION,
     author="Bugout.dev",
     author_email="[email protected]",
@@ -19,34 +17,41 @@
     url="https://github.com/bugout-dev/spire",
     platforms="all",
     classifiers=[
-        "Development Status :: 2 - Pre-Alpha",
+        "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
         "Natural Language :: English",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: Implementation :: CPython",
+        "License :: OSI Approved :: Apache Software License",
         "Topic :: Software Development :: Libraries",
-        "Topic :: Software Development :: Libraries :: Python Modules",
     ],
     python_requires=">=3.6",
     packages=find_packages(),
     package_data={"bugout": ["py.typed"]},
     zip_safe=False,
     install_requires=[
-        "alembic",
-        "boto3",
-        "brood @ git+https://[email protected]/bugout-dev/brood.git@d33bb91a8108d02d7509ef25541ff07e31e41680#egg=brood",
-        "bugout",
-        "bugout-locust",
+        "appdirs",
+        "boto3>=1.20.2",
+        "bugout>=0.1.18",
+        "bugout-brood>=0.2.0",
+        "bugout-locust>=0.2.8",
+        "cached-property",
+        "chardet",
         "elasticsearch",
-        "fastapi",
+        "fastapi>=0.70.0",
         "jwt",
-        "psycopg2-binary",
+        "httptools",
+        "multidict",
+        "psycopg2-binary>=2.9.1",
         "pydantic",
+        "pyjwt",
+        "redis",
         "requests",
-        "SQLAlchemy",
-        "uvicorn",
+        "sqlalchemy>=1.4.26",
+        "typed-ast",
+        "uvicorn>=0.15.0",
     ],
-    extras_require={"dev": ["black", "mypy"]},
+    extras_require={
+        "dev": ["alembic", "black", "isort", "mypy", "types-requests"],
+        "distribute": ["setuptools", "twine", "wheel"],
+    },
 )