From b914d1ae73c853d51aca90e9b1ca2559e440d1f4 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Sun, 5 Jul 2020 01:21:17 +0200
Subject: [PATCH] CI, celery, compose setup, hackity hack hack

---
 .drone.yml          |  10 +---------
 .envrc.sample       |   7 ++++---
 Dockerfile          |  23 +++++++++++++----------
 README.md           |   6 +++++-
 celerybeat-schedule | Bin 0 -> 16384 bytes
 celworker.py        |   2 +-
 docker-compose.yml  |  36 ++++++++++++++++++++++++++++++++++++
 magic_app/app.py    |  25 +++++++++++++++++++------
 magic_app/config.py |   4 +++-
 magic_app/views.py  |   1 +
 pyproject.toml      |   3 ++-
 tox.ini             |  14 +++-----------
 wsgi.py             |   2 +-
 13 files changed, 89 insertions(+), 44 deletions(-)
 create mode 100644 celerybeat-schedule
 create mode 100644 docker-compose.yml

diff --git a/.drone.yml b/.drone.yml
index d2287d7..f6ec0df 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,10 +1,6 @@
 ---
 matrix:
   include:
-    - IMAGE: 3.6-stretch
-      TOXENV: py36
-    - IMAGE: 3.7-stretch
-      TOXENV: py37
     - IMAGE: 3.8-buster
       TOXENV: py38
     - IMAGE: 3.8-buster
@@ -15,14 +11,10 @@ matrix:
       TOXENV: format
     - IMAGE: 3.8-buster
       TOXENV: type
-    - IMAGE: 3.8-buster
-      TOXENV: docs
-    - IMAGE: 3.8-buster
-      TOXENV: metadata-release
 
 pipeline:
   build:
     image: python:${IMAGE}
     commands:
-      - pip install tox==3.14.6
+      - pip install tox
       - tox -e ${TOXENV}
diff --git a/.envrc.sample b/.envrc.sample
index 7dca380..991560b 100644
--- a/.envrc.sample
+++ b/.envrc.sample
@@ -1,6 +1,7 @@
-export CELERY_BROKER_URL=redis://localhost:6379/1
-export CELERY_RESULT_BACKEND=redis://localhost:6379/1
-export ENV=development
+export CELERY_BROKER_URL=redis://localhost:6379
+export CELERY_RESULT_BACKEND=redis://localhost:6379
+export FLASK_ENV=development
+export FLASK_APP=wsgi:app
 export REDIS_HOST=localhost
 export REDIS_PORT=6379
 export REDIS_SESSION_DB=0
diff --git a/Dockerfile b/Dockerfile
index e2554d8..6389ddf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,20 +7,23 @@ WORKDIR ${APP_ROOT}
 COPY . ${APP_ROOT}
 
 RUN apk add --update \
-  build-base   \
-  curl         \
-  git          \
-  libffi-dev   \
-  libsasl      \
+  build-base \
+  curl \
+  git \
+  libffi-dev \
+  libsasl \
+  openssl-dev \
   python3-dev
 
-
 RUN addgroup -S ${CELERY_USER}
-RUN adduser -D         \
-  -h ${APP_ROOT}       \
+RUN adduser -D \
+  -h ${APP_ROOT} \
   -s /usr/sbin/nologin \
-  -G ${CELERY_USER} ${CELERY_USER}
+  -G ${CELERY_USER} \
+  ${CELERY_USER}
 
 RUN pip install "poetry>=1.0.9,<2.0"
 
-RUN poetry install
+RUN poetry install \
+  --no-dev \
+  --no-interaction
diff --git a/README.md b/README.md
index 22cec34..30347fb 100644
--- a/README.md
+++ b/README.md
@@ -4,4 +4,8 @@ A swarm of dreams.
 
 # Development
 
-TODO.
+```
+$ docker-compose up
+```
+
+Then see http://localhost:5000.
diff --git a/celerybeat-schedule b/celerybeat-schedule
new file mode 100644
index 0000000000000000000000000000000000000000..bebe88a5b3a835ec30eae377cc0389c74ea17323
GIT binary patch
literal 16384
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
FzX1m?owNV|

literal 0
HcmV?d00001

diff --git a/celworker.py b/celworker.py
index 8fb9129..e346e31 100644
--- a/celworker.py
+++ b/celworker.py
@@ -4,6 +4,6 @@ from os import environ
 from magic_app.app import celery, create_app  # noqa
 from magic_app.config import CONFIG
 
-config = CONFIG[environ["ENV"]]
+config = CONFIG[environ["FLASK_ENV"]]
 app = create_app(config=config)
 app.app_context().push()
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..667c115
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,36 @@
+---
+version: "3.8"
+
+x-env: &env
+  environment:
+    CELERY_BROKER_URL: "redis://redis:6379"
+    CELERY_RESULT_BACKEND: "redis://redis:6379"
+    FLASK_APP: "wsgi:app"
+    FLASK_ENV: "development"
+    REDIS_HOST: "redis"
+    REDIS_PORT: "6379"
+    REDIS_SESSION_DB: "0"
+
+services:
+  flask:
+    build: .
+    <<: *env
+    ports:
+      - "5000:5000"
+    command: |
+      poetry run 
+      flask run --host 0.0.0.0
+    volumes:
+      - "./:/magic_app/"
+
+  celery:
+    build: .
+    <<: *env
+    command: |
+      poetry run 
+      celery worker -A celworker.celery -B -l debug
+    volumes:
+      - "./:/magic_app/"
+
+  redis:
+    image: redis:alpine
diff --git a/magic_app/app.py b/magic_app/app.py
index f0c109e..dda2f14 100644
--- a/magic_app/app.py
+++ b/magic_app/app.py
@@ -7,7 +7,9 @@ from redis import Redis
 
 from magic_app.config import Base, Production
 
-celery = Celery(__name__, broker=Base.CELERY_BROKER_URL)
+celery = Celery(
+    __name__, backend=Base.CELERY_RESULT_BACKEND, broker=Base.CELERY_BROKER_URL
+)
 
 
 def create_app(config=Production):
@@ -15,8 +17,7 @@ def create_app(config=Production):
     app = Flask(__name__.split(".")[0])
     app.config.from_object(config)
 
-    celery.conf.update(app.config)
-
+    configure_celery(app)
     configure_redis(app)
     configure_views(app)
     configure_logging(app)
@@ -28,11 +29,11 @@ def configure_redis(app):
     """Configure Redis connection."""
     from magic_app.session import RedisSessionDB
 
-    host = (Base.REDIS_HOST,)
-    port = (Base.REDIS_PORT,)
+    host = Base.REDIS_HOST
+    port = Base.REDIS_PORT
     db_num = Base.REDIS_SESSION_DB
 
-    if app.debug:
+    if app.testing:
         from fakeredis import FakeRedis
 
         connection = FakeRedis()
@@ -42,6 +43,18 @@ def configure_redis(app):
     app.config["SESSION"] = RedisSessionDB(connection)
 
 
+def configure_celery(app):
+    """Configure celery."""
+    celery.conf.update(app.config)
+
+    class ContextTask(celery.Task):
+        def __call__(self, *args, **kwargs):
+            with app.app_context():
+                return self.run(*args, **kwargs)
+
+    celery.Task = ContextTask
+
+
 def configure_views(app):
     """Configure API resource views."""
     from magic_app.views import home
diff --git a/magic_app/config.py b/magic_app/config.py
index 99939ac..bf04d1f 100644
--- a/magic_app/config.py
+++ b/magic_app/config.py
@@ -25,14 +25,16 @@ class Development(Base):
     """The Development configuration."""
 
     ENV = "development"
-    DEBUG = True
+
     CELERY_ALWAYS_EAGER = True
+    DEBUG = True
 
 
 class Testing(Base):
     """The testing configuration."""
 
     ENV = "testing"
+    TESTING = True
 
 
 class Production(Base):
diff --git a/magic_app/views.py b/magic_app/views.py
index dcfcc94..355faca 100644
--- a/magic_app/views.py
+++ b/magic_app/views.py
@@ -6,4 +6,5 @@ home = Blueprint("home", __name__)
 
 @home.route("/")
 def hello_world():
+
     return "Hello, World"
diff --git a/pyproject.toml b/pyproject.toml
index 9529fa6..83bf660 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,8 @@ keywords = ["docker", "swarm", "packaging"]
 celery = "^4.4.6"
 flask = "^1.1.2"
 flask-wtf = "^0.14.3"
-python = "^3.6"
+gunicorn = "^20.0.4"
+python = "^3.8"
 redis = "^3.5.3"
 
 [tool.poetry.dev-dependencies]
diff --git a/tox.ini b/tox.ini
index 58df933..2a6f9e9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    {py36,py37,py38}
+    py38
     lint
     sort
     format
@@ -9,12 +9,6 @@ skip_missing_interpreters = True
 isolated_build = True
 
 [testenv]
-description = run the unit tests
-deps =
-  pytest
-  pytest-cov
-  pytest-mock
-commands = pytest test/ --cov={toxinidir}/magic_app/ --no-cov-on-fail {posargs}
 
 [testenv:lint]
 description = lint the source
@@ -26,25 +20,23 @@ commands = flake8 {posargs} magic_app/ test/
 description = sort the source
 skipdist = True
 deps = isort
-commands = isort {posargs:-rc -c} -sp setup.cfg magic_app/ test/
+commands = isort {posargs:-c} -sp setup.cfg magic_app/ test/
 
 [testenv:format]
 description = format the source
 skipdist = True
-basepython = python3.8
 deps = black
 commands = black {posargs:--check} magic_app/ test/
 
 [testenv:type]
 description = type check the source
-basepython = python3.8
 skipdist = True
 deps = mypy
 commands = mypy magic_app/ test/
 
 [testenv:release]
 description = make a release
-deps = {[testenv:metadata-release]deps}
+deps = twine
 commands =
     rm -rf {toxworkdir}/dist
     python -m setup sdist --dist-dir {toxworkdir}/dist bdist_wheel
diff --git a/wsgi.py b/wsgi.py
index 2bc1c81..7c2e3cb 100644
--- a/wsgi.py
+++ b/wsgi.py
@@ -4,5 +4,5 @@ import os
 from magic_app.app import create_app
 from magic_app.config import CONFIG
 
-config = CONFIG[os.environ["ENV"]]
+config = CONFIG[os.environ["FLASK_ENV"]]
 app = create_app(config=config)