grim/anzu

Add a makefile and add linting and run support and clean up all the lint

2016-02-18, Gary Kramlich
ac05508ddd02
Parents 6b9eb962654a
Children dc7bed82b263
Add a makefile and add linting and run support and clean up all the lint
7 files changed, 42 insertions(+), 3 deletions(-)
  • +1 -0
    .hgignore
  • +30 -0
    Makefile
  • +2 -0
    dev-requirements.txt
  • +7 -2
    src/anzu/app.py
  • +1 -0
    src/anzu/job.py
  • +1 -0
    src/anzu/scenario.py
  • +0 -1
    src/anzu/worker.py
    • --- a/.hgignore Wed Feb 17 23:46:21 2016 -0600
    +++ b/.hgignore Thu Feb 18 00:26:26 2016 -0600
    @@ -1,3 +1,4 @@
    syntax: regexp
    \/__pycache__\/
    +\.venv\/
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Makefile Thu Feb 18 00:26:26 2016 -0600
    @@ -0,0 +1,30 @@
    +#!/usr/bin/make -f
    +
    +VENV ?= .venv
    +
    +REQUIREMENTS = dev-requirements.txt
    +
    +.PHONY: all clean lint run virtualenv
    +
    +VENV_ACTIVATE = $(VENV)/bin/activate
    +
    +all: lint
    +
    +clean: Dockerfile
    + docker-compose rm -f
    + rm -rf $(VENV)
    +
    +virtualenv: $(VENV_ACTIVATE)
    +
    +$(VENV_ACTIVATE): $(REQUIREMENTS)
    + test -f $(VENV)/bin/activate || virtualenv --no-site-packages --python=python3 $(VENV)
    + . $(VENV_ACTIVATE) ; echo $< | xargs -n 1 pip install -U -r
    + touch $@
    +
    +lint: src/ virtualenv
    + . $(VENV_ACTIVATE) ; flake8 src
    +
    +run: lint docker-compose.yml Dockerfile
    + docker-compose build
    + docker-compose up
    +
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/dev-requirements.txt Thu Feb 18 00:26:26 2016 -0600
    @@ -0,0 +1,2 @@
    +flake8
    +
    --- a/src/anzu/app.py Wed Feb 17 23:46:21 2016 -0600
    +++ b/src/anzu/app.py Thu Feb 18 00:26:26 2016 -0600
    @@ -1,3 +1,4 @@
    +# vi:et:ts=4 sw=4 sts=4
    import os
    from celery import Celery
    @@ -8,9 +9,11 @@
    def make_celery(app):
    + redis_port = os.environ['REDIS_PORT_6379_TCP'].replace('tcp:', 'redis:')
    +
    celery_config = {
    - 'BROKER_URL': os.environ['REDIS_PORT_6379_TCP'].replace('tcp:', 'redis:'),
    - 'CELERY_RESULT_BACKEND': os.environ['REDIS_PORT_6379_TCP'].replace('tcp:', 'redis:'),
    + 'BROKER_URL': redis_port,
    + 'CELERY_RESULT_BACKEND': redis_port,
    'CELERY_TASK_SERIALIZER': 'json',
    'CELERY_RESULT_SERIALIZER': 'json',
    'CELERY_ACCEPT_CONTENT': ['json'],
    @@ -22,8 +25,10 @@
    celery.conf.update(celery_config)
    TaskBase = celery.Task
    +
    class ContextTask(TaskBase):
    abstract = True
    +
    def __call__(self, *args, **kwargs):
    with app.app_context():
    return TaskBase.__call__(self, *args, **kwargs)
    --- a/src/anzu/job.py Wed Feb 17 23:46:21 2016 -0600
    +++ b/src/anzu/job.py Thu Feb 18 00:26:26 2016 -0600
    @@ -1,5 +1,6 @@
    from anzu.views import BlueprintView
    +
    class Job(BlueprintView):
    url_prefix = '/job/'
    url_rules = {
    --- a/src/anzu/scenario.py Wed Feb 17 23:46:21 2016 -0600
    +++ b/src/anzu/scenario.py Thu Feb 18 00:26:26 2016 -0600
    @@ -6,6 +6,7 @@
    from anzu.views import BlueprintView
    +
    class Scenario(BlueprintView):
    url_prefix = '/scenario/'
    url_rules = {
    --- a/src/anzu/worker.py Wed Feb 17 23:46:21 2016 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,1 +0,0 @@
    -from concurrent.futures import ThreadPoolExecutor