Fix sandbox.

Author: stephrdev

Vagrantfile

@@ -2,7 +2,7 @@
 # vi: set ft=ruby :
 
 Vagrant::Config.run do |config|
-    config.vm.box = "ubuntu/trusty64"
+    config.vm.box = "ubuntu/focal64"
     config.vm.forward_port 8000, 8080
-    config.vm.provision "shell", path: "sandbox/provision.sh"
+    config.vm.provision "shell", path: "sandbox/provision.sh", privileged: false
 end

docs/contributing.rst

@@ -33,3 +33,31 @@ Finally, you can also use tox to run tests against
 all supported Django and Python versions::
 
     $ tox
+
+
+Sandbox VM
+==========
+
+There is a ``VagrantFile`` for setting up a sandbox VM where you can play around
+with the functionality.  Bring up the Vagrant box::
+
+    $ vagrant up
+
+This may take a while but will set up a Ubuntu Precise64 VM with RabbitMQ
+installed.  You can then SSH into the machine::
+
+    $ vagrant ssh
+    $ cd /vagrant/sandbox
+
+You can now decide to run the Celery implementation::
+
+    $ honcho -f Procfile.celery start
+
+Or you can run the RQ implementation::
+
+    $ honcho -f Procfile.rq start
+
+The above commands will start a Django runserver and the selected task worker.
+The dummy site will be available at ``http://localhost:8080`` on your host
+machine.  There are some sample views in ``sandbox/dummyapp/views.py`` that
+exercise django-cacheback.

sandbox/Procfile.celery

@@ -1,2 +1,2 @@
-web: env PYTHONUNBUFFERED=true python manage.py runserver 0.0.0.0:8000
-worker: env PYTHONUNBUFFERED=true celery -A sandbox worker --loglevel=INFO
+web: env QUEUE=celery poetry run python manage.py runserver 0.0.0.0:8000
+worker: env QUEUE=celery poetry run celery -A sandbox worker --loglevel=INFO

sandbox/Procfile.rq

@@ -1,2 +1,2 @@
-web: env PYTHONUNBUFFERED=true QUEUE=rq python manage.py runserver 0.0.0.0:8000
-worker: env PYTHONUNBUFFERED=true QUEUE=rq python manage.py rqworker
+web: env QUEUE=rq poetry run python manage.py runserver 0.0.0.0:8000
+worker: env QUEUE=rq poetry run python manage.py rqworker

sandbox/__init__.py

@@ -1 +1,3 @@
-from .celeryconfig import *
+from .celeryconfig import app as celery_app
+
+__all__ = ('celery_app',)

sandbox/celeryconfig.py

@@ -1,16 +1,12 @@
-from __future__ import absolute_import
 import os
 
 from celery import Celery
 
-# set the default Django settings module for the 'celery' program.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings')
 
 from django.conf import settings  # noqa
 
 app = Celery('sandbox')
 
-# Using a string here means the worker will not have to
-# pickle the object when using Windows.
-app.config_from_object('django.conf:settings')
-app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
+app.config_from_object('django.conf:settings', namespace='CELERY')
+app.autodiscover_tasks()

sandbox/dummyapp/views.py

@@ -1,7 +1,7 @@
 from django.shortcuts import render
 
-from cacheback.queryset import QuerySetFilterJob
-from cacheback.function import FunctionJob
+from cacheback.jobs import QuerySetFilterJob
+from cacheback.jobs import FunctionJob
 from cacheback.decorators import cacheback
 
 from dummyapp import jobs

sandbox/provision.sh

@@ -1,15 +1,14 @@
 #!/bin/bash
 
-apt-get update
-apt-get install -y rabbitmq-server redis-server memcached python-pip git
+sudo apt-get update
+sudo apt-get install -y redis-server memcached python3-pip git
+sudo pip3 install -U pip poetry honcho
 
-pip install -U pip honcho
 cd /vagrant
-pip install -e .[celery]
-pip install -e .[rq]
-`which pip` install -r requirements.txt -r sandbox/requirements.txt
+poetry install
+poetry run pip install -r sandbox/requirements.txt
 
-# Create database
+# Create and fill database
 cd /vagrant/sandbox
-./manage.py migrate
-./manage.py loaddata fixture.json
+poetry run python manage.py migrate
+poetry run python manage.py loaddata fixture.json

sandbox/requirements.txt

@@ -1 +1 @@
-python-memcached==1.53
+python-memcached>=1.59

sandbox/settings.py

@@ -95,7 +95,7 @@
     },
 ]
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -115,6 +115,7 @@
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'sandbox',
     'dummyapp',
     'django_rq',
     'cacheback',
@@ -162,8 +163,8 @@
 
 # CACHEBACK SETTINGS
 
-BROKER_URL = 'amqp://guest:guest@localhost/'
-CELERY_RESULT_BACKEND = 'amqp://'
+CELERY_BROKER_URL = 'redis://localhost:6379/0'
+CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
 CELERY_TASK_SERIALIZER = 'json'
 
 RQ_QUEUES = {