Update for Django 3

Author: synw

MANIFEST.in

@@ -1,5 +1,4 @@
 recursive-include mqueue/static *
-recursive-include mqueue/templates *
 recursive-include mqueue/migrations *
 recursive-include mqueue/locale *
 recursive-include mqueue/hooks *

docs/api/api.rst

@@ -1,20 +1,18 @@
 Graphql Api
 ===========
 
-*New in 0.9*
-
 It is possible to query for public events, users events and staff events.
 
 Settings
 ~~~~~~~~
 
-Install with ``pip install django-graphql-utils django-filters``
+Install with ``pip install graphene-django django-filter``
 
  .. highlight:: python
 
 ::
 
-   INSTALLED_APPS += ("graphene_django", "graphql_utils", "django_filters",)
+   INSTALLED_APPS += ("graphene_django", "django_filters",)
 
    GRAPHENE = {
       'SCHEMA': 'mqueue.schema.schema'
@@ -31,18 +29,16 @@ Urls:
 ::
 
    from django.conf import settings
+   from django.views.decorators.csrf import csrf_exempt
    from graphene_django.views import GraphQLView
-   from graphql_utils.views import TGraphQLView
    
    urlpatterns = [
     # ...
-    url(r'^graphql', TGraphQLView.as_view()),
+    path('graphql', GraphQLView.as_view()),
    ]
    
    if settings.DEBUG:
-      urlpatterns += [url(r'^graphiql', GraphQLView.as_view(graphiql=True)), ]
-
-Note: the ``/graphql`` endpoint is protected by a Django csrf token
+      urlpatterns += [path('graphiql', csrf_exempt(GraphQLView.as_view(graphiql=True)))]
 
 Event scope
 ~~~~~~~~~~~
@@ -62,6 +58,8 @@ Possible scope values are: ``public``, ``users``, ``staff``, ``superuser`` (defa
 Queries
 ~~~~~~~
 
+Go to ``http://localhost:8000/graphiql/`` to test the queries
+
 Available queries are:
 
 ``publicEvents``, ``usersEvents``, ``staffEvents``, ``allEvents`` (for the superuser)
@@ -77,7 +75,7 @@ Example: public events:
          edges {
             node {
                name
-               event_class
+               eventClass
             }
          }
       }

docs/index.rst

@@ -14,7 +14,6 @@ Add to INSTALLED_APPS:
 
 ::
 
-   "django_extensions",
    "mqueue",
 
 Run the migrations.

docs/settings/graphical_settings.rst

@@ -5,7 +5,7 @@ Event classes
 ~~~~~~~~~~~~~
 
 You can define your custom set of event classes and the corresponding
-css classes to display in the admin. The default values are (check ``mqueue/static/mqueue.css``):
+css classes to display in the admin. The default values are (check ``mqueue/static/mqueue/mqueue.css``):
 
 .. highlight:: python
 

docs/usage/hooks.rst

@@ -1,56 +1,12 @@
 Hooks
 =====
 
-*New in 0.7.1* (inspired by `Logrus <https://github.com/sirupsen/logrus>`_)
+Optional hooks can be used to perform extra actions on events (inspired by `Logrus <https://github.com/sirupsen/logrus>`_). 
+Available hooks:
 
-Optional hooks can be used to perform extra actions on events. Available hooks:
-
-- **Postgresql**: record the events in a postgresql database (go)
-- **Influxdb**: record the events in an influxdb database (go)
 - **Redis**: record the events in Redis (python)
 - **Centrifugo**: push events as messages in the Centrifugo websockets server (python)
 
-Postgresql
-----------
-
-In ``settings.py``
-
-.. highlight:: python
-
-::
-
-   MQUEUE_HOOKS = {
-    "postgresql": {
-        "path": "mqueue.hooks.postgresql",
-        "addr": "localhost",
-        "user": "user",
-        "password": "pwd",
-        "database": "mydomain_events",
-        "table": "events"
-    }
-   }
-
-Create the database in postgresql and migrate it with a management command:
-
-::
-
-   python3 manage.py mqueue_migrate_pg
-   
-Influxdb
---------
-
-::
-
-   "influxdb": {
-        "path": "mqueue.hooks.influxdb",
-        "addr": "http://localhost:8086",
-        "user": "admin",
-        "password": "admin",
-        "database": "events"
-    }
-
-Create the database in Influxdb
-
 Redis
 -----
 

mqueue/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.9.5'
+__version__ = '0.10.0'
 default_app_config = 'mqueue.apps.MqueueConfig'

mqueue/admin.py

@@ -2,24 +2,29 @@
 
 from django.utils.translation import ugettext_lazy as _
 from django.contrib import admin
-from mqueue.models import MEvent
-from mqueue.utils import format_event_class
+from django.utils.html import format_html
+from .models import MEvent
+from .utils import format_event_class
 
 
 def link_to_object(obj):
-    return '<a href="' + obj.url + '" target="_blank">' + obj.url + '</a>'
+    return format_html('<a href="' + obj.url + '" target="_blank">' + obj.url + '</a>')
 
 
 def link_to_object_admin(obj):
-    return '<a href="' + obj.admin_url + '" target="_blank">' + obj.admin_url + '</a>'
+    return format_html('<a href="' + obj.admin_url + '" target="_blank">' + obj.admin_url + '</a>')
+
+
+def event(obj):
+    return format_html(format_event_class(obj))
 
 
 @admin.register(MEvent)
 class MEventAdmin(admin.ModelAdmin):
     date_hierarchy = 'date_posted'
     readonly_fields = ['date_posted', 'request']
-    list_display = [format_event_class, 'name', 'date_posted',
-                    'bucket', 'user', link_to_object, link_to_object_admin]
+    list_display = [event, 'name', 'date_posted',
+                    'bucket', 'user', link_to_object, link_to_object_admin, 'scope']
     list_filter = (
         'event_class',
         ('content_type', admin.RelatedOnlyFieldListFilter),
@@ -39,6 +44,11 @@ class MEventAdmin(admin.ModelAdmin):
         'content_type',
     )
 
+    class Media:
+        css = {
+        'all': ('mqueue/mqueue.css',)
+         }
+
     def get_readonly_fields(self, request, obj=None):
         super(MEventAdmin, self).get_readonly_fields(request, obj)
         return ('notes', 'request')

mqueue/apps.py

@@ -10,7 +10,7 @@ class MqueueConfig(AppConfig):
     def ready(self):
         # models registration from settings
         from django.conf import settings
-        from mqueue.tracking import mqueue_tracker
+        from .tracking import mqueue_tracker
         registered_models = getattr(settings, 'MQUEUE_AUTOREGISTER', [])
         for modtup in registered_models:
             modpath = modtup[0]
@@ -28,6 +28,6 @@ def ready(self):
                 raise(e)
 
         # watchers
-        from mqueue.watchers import init_watchers
-        from mqueue.conf import WATCH
+        from .watchers import init_watchers
+        from .conf import WATCH
         init_watchers(WATCH)

mqueue/handlers.py

@@ -7,7 +7,7 @@
 class LogsDBHandler(Handler, object):
 
     def emit(self, record):
-        from mqueue.models import MEvent
+        from .models import MEvent
         msg = record.getMessage()
         name = msg[:120]
         if record.exc_info:

mqueue/hooks/centrifugo/__init__.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from mqueue.conf import DOMAIN
+from ...conf import DOMAIN
 try:
     from instant.conf import SITE_SLUG
     from instant.producers import publish