Update to latest standards

.travis.yml

@@ -1,22 +1,23 @@
+sudo: false
 language: python
 python:
-  - "2.6"
   - "2.7"
-  - "3.2"
   - "3.3"
   - "3.4"
+  - "3.5"
 env:
-  - DJANGO=1.6
   - DJANGO=1.7
+  - DJANGO=1.8
+  - DJANGO=1.9
   - DJANGO=master
 matrix:
   exclude:
-    - python: "2.6"
-      env: DJANGO=1.7
-    - python: "2.6"
+    - python: "3.3"
+      env: DJANGO=1.9
+    - python: "3.3"
       env: DJANGO=master
-    - python: "3.4"
-      env: DJANGO=1.6
+    - python: "3.5"
+      env: DJANGO=1.7
 install:
   - pip install tox coveralls
 script:

makemigrations.py

@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+import os
+import sys
+
+import django
+
+from django.conf import settings
+
+
+DEFAULT_SETTINGS = dict(
+    INSTALLED_APPS=[
+        "django.contrib.auth",
+        "django.contrib.contenttypes",
+        "django.contrib.sites",
+        "pinax.lms.activities",
+        "pinax.lms.activities.tests"
+    ],
+    MIDDLEWARE_CLASSES=[],
+    DATABASES={
+        "default": {
+            "ENGINE": "django.db.backends.sqlite3",
+            "NAME": ":memory:",
+        }
+    },
+    SITE_ID=1,
+    ROOT_URLCONF="pinax.lms.activities.tests.urls",
+    SECRET_KEY="notasecret",
+)
+
+
+def run(*args):
+    if not settings.configured:
+        settings.configure(**DEFAULT_SETTINGS)
+
+    django.setup()
+
+    parent = os.path.dirname(os.path.abspath(__file__))
+    sys.path.insert(0, parent)
+
+    django.core.management.call_command(
+        "makemigrations",
+        "pinax_lms_activities",
+        *args
+    )
+
+
+if __name__ == "__main__":
+    run(*sys.argv[1:])

pinax/lms/activities/__init__.py

@@ -1,4 +1,4 @@
 import pkg_resources
 
-
+default_app_config = "pinax.lms.activities.apps.AppConfig"
 __version__ = pkg_resources.get_distribution("pinax-lms-activities").version

pinax/lms/activities/apps.py

@@ -0,0 +1,11 @@
+import importlib
+
+from django.apps import AppConfig as BaseAppConfig
+from django.utils.translation import ugettext_lazy as _
+
+
+class AppConfig(BaseAppConfig):
+
+    name = "pinax.lms.activities"
+    label = "pinax_lms_actitivies"
+    verbose_name = _("Pinax LMS Activities")

pinax/lms/activities/models.py

@@ -1,7 +1,9 @@
+import importlib
+
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
-from django.utils import importlib, timezone
+from django.utils import timezone
 
 from django.contrib.auth.models import User
 

pinax/lms/activities/tests/urls.py

@@ -1,10 +1,6 @@
-try:
-    from django.conf.urls import patterns, include
-except ImportError:
-    from django.conf.urls.defaults import patterns, include
+from django.conf.urls import include
 
 
-urlpatterns = patterns(
-    "",
+urlpatterns = [
     (r"^", include("pinax.lms.activities.urls")),
-)
+]

pinax/lms/activities/urls.py

@@ -1,12 +1,12 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
+from . import views
 
-urlpatterns = patterns(
-    "pinax.lms.activities.views",
-    url(r"(?P<slug>[\w\-]+)/start/$", "activity_start", name="activity_start"),
-    url(r"(?P<slug>[\w\-]+)/play/$", "activity_play", name="activity_play"),
-    url(r"(?P<slug>[\w\-]+)/completed/$", "activity_completed", name="activity_completed"),
+urlpatterns = [
+    url(r"(?P<slug>[\w\-]+)/start/$", views.activity_start, name="activity_start"),
+    url(r"(?P<slug>[\w\-]+)/play/$", views.activity_play, name="activity_play"),
+    url(r"(?P<slug>[\w\-]+)/completed/$", views.activity_completed, name="activity_completed"),
 
-    url(r"^staff/$", "staff_dashboard", name="staff_dashboard"),
-    url(r"^staff/activity/([^/]+)/$", "staff_activity_detail", name="staff_activity_detail"),
-)
+    url(r"^staff/$", views.staff_dashboard, name="staff_dashboard"),
+    url(r"^staff/activity/([^/]+)/$", views.staff_activity_detail, name="staff_activity_detail"),
+]

pinax/lms/activities/views.py

@@ -1,13 +1,13 @@
 from django.conf import settings
 from django.http import Http404
 from django.shortcuts import redirect, render
+from django.views.decorators.http import require_POST
 
 from django.contrib.auth.models import User
 
 from account.decorators import login_required
-from django.views.decorators.http import require_POST
 
-from eventlog.models import log
+from pinax.eventlog.models import log
 
 from .models import (
     ActivityState,

runtests.py

@@ -31,9 +31,7 @@ def runtests(*test_args):
     if not settings.configured:
         settings.configure(**DEFAULT_SETTINGS)
 
-    # Compatibility with Django 1.7's stricter initialization
-    if hasattr(django, "setup"):
-        django.setup()
+    django.setup()
 
     parent = os.path.dirname(os.path.abspath(__file__))
     sys.path.insert(0, parent)

setup.cfg

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1

setup.py

@@ -27,8 +27,8 @@ def read(*parts):
     },
     test_suite="runtests.runtests",
     install_requires=[
-        "eventlog>=0.10.0",
-        "django-jsonfield>=0.8.11"
+        "pinax-eventlog>=1.1.1",
+        "jsonfield>=1.0.3"
     ],
     classifiers=[
         "Development Status :: 4 - Beta",

tox.ini

@@ -2,103 +2,28 @@
 ignore = E265,E501
 max-line-length = 100
 max-complexity = 10
+exclude = migrations/*,docs/*
 
 [tox]
 envlist =
-    py26-1.6,
-    py27-1.6, py27-1.7, py27-master,
-    py32-1.6, py32-1.7, py32-master,
-    py33-1.6, py33-1.7, py33-master,
-    py34-1.7, py34-master
+    py27-{1.7,1.8,1.9,master},
+    py33-{1.7,1.8},
+    py34-{1.7,1.8,1.9,master},
+    py35-{1.8,1.9,master}
 
 [testenv]
 deps =
-    flake8 == 2.2.3
-    coverage == 3.7.1
+    coverage == 4.0.2
+    flake8 == 2.5.0
+    1.7: Django>=1.7,<1.8
+    1.8: Django>=1.8,<1.9
+    1.9: Django>=1.9,<1.10
+    master: https://github.com/django/django/tarball/master
 usedevelop = True
 setenv =
    LANG=en_US.UTF-8
    LANGUAGE=en_US:en
    LC_ALL=en_US.UTF-8
 commands =
-  coverage run setup.py test
-  coverage report -m
-  flake8 pinax
-
-[testenv:py26-1.6]
-basepython = python2.6
-deps =
-    {[testenv]deps}
-    Django<1.6
-
-[testenv:py27-1.7]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    Django<1.7
-
-[testenv:py27-1.6]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    Django<1.6
-
-[testenv:py27-master]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    https://github.com/django/django/tarball/master
-
-[testenv:py32-1.7]
-basepython = python3.2
-deps =
-    {[testenv]deps}
-    Django<1.7
-
-[testenv:py32-1.6]
-basepython = python3.2
-deps =
-    {[testenv]deps}
-    Django<1.6
-
-[testenv:py32-master]
-basepython = python3.2
-deps =
-    {[testenv]deps}
-    https://github.com/django/django/tarball/master
-
-[testenv:py33-1.7]
-basepython = python3.3
-deps =
-    {[testenv]deps}
-    Django<1.7
-
-[testenv:py33-1.6]
-basepython = python3.3
-deps =
-    {[testenv]deps}
-    Django<1.6
-
-[testenv:py33-master]
-basepython = python3.3
-deps =
-    {[testenv]deps}
-    https://github.com/django/django/tarball/master
-
-[testenv:py34-1.7]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    Django<1.7
-
-[testenv:py34-1.6]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    Django<1.6
-
-[testenv:py34-master]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    https://github.com/django/django/tarball/master
+    flake8 pinax
+    coverage run setup.py test