Merge branch 'feature/django19'

Author: JoeJasinski

.gitignore

@@ -46,3 +46,5 @@ docs/_build/
 target/
 *.sqlite3
 pep8.txt
+.eggs
+.ropeproject

.travis.yml

@@ -3,22 +3,20 @@ language: python
 python:
   - 2.7
   - 3.4
+  - 3.5
+  - 3.6
 
 env:
-  - DJANGO=1.4.16
-  - DJANGO=1.5.11
-  - DJANGO=1.6.8
-  - DJANGO=1.7.1
-  - DJANGO=1.8.11
-
-matrix:
-  exclude:
-    - python: 3.4
-      env: DJANGO=1.4.16
+  - DJANGO=1.8.17
+  - DJANGO=1.9.13
+  - DJANGO=1.10.8
+  - DJANGO=1.11.9
 
 install:
+  - pip install pip --upgrade
+  - pip install setuptools --upgrade
   - pip install Django==$DJANGO
   - pip install -e .
 
-script: 
-  - python setup.py test 
+script:
+  - demo/manage.py test nocaptcha_recaptcha

MANIFEST.in

@@ -3,7 +3,6 @@ include LICENSE
 include README.md
 include MANIFEST.in
 include setup.py
-include test_settings.py
 recursive-include demo *
 recursive-include nocaptcha_recaptcha *
 recursive-exclude * __pycache__

demo/demo/settings.py

@@ -1,12 +1,12 @@
 # Django settings for demo project.
 import os
 import sys
+from django import VERSION
 
 PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ))
 sys.path.insert(0, os.path.join(PROJECT_ROOT, '..', '..'))
 
 DEBUG = True
-TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     # ('Your Name', 'your_email@example.com'),
@@ -94,12 +94,6 @@
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'x$47^-hmv-kaa0trcc*ry%+b^^2f)$rs#cl)6j&!)j2c&h%88e'
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-    # 'django.template.loaders.eggs.Loader',
-)
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
@@ -116,12 +110,47 @@
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'demo.wsgi.application'
 
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-    os.path.join(PROJECT_ROOT, 'templates'),
-)
+
+if VERSION >= (1, 8, 0):
+
+    TEMPLATES = [
+        {
+            'BACKEND': 'django.template.backends.django.DjangoTemplates',
+            'DIRS': [
+                os.path.join(PROJECT_ROOT, 'templates'),
+            ],
+            'APP_DIRS': True,
+            'OPTIONS': {
+                'context_processors': [
+                    'django.contrib.auth.context_processors.auth',
+                    'django.template.context_processors.i18n',
+                    'django.template.context_processors.request',
+                    'django.template.context_processors.media',
+                    'django.template.context_processors.static',
+                    'django.contrib.messages.context_processors.messages',
+                    'example.apps.core.context_processors.site',
+                ],
+            },
+        },
+    ]
+else:
+
+    TEMPLATE_DEBUG = DEBUG
+
+    # List of callables that know how to import templates from various sources.
+    TEMPLATE_LOADERS = (
+        'django.template.loaders.filesystem.Loader',
+        'django.template.loaders.app_directories.Loader',
+        # 'django.template.loaders.eggs.Loader',
+    )
+
+    TEMPLATE_DIRS = (
+        # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+        # Always use forward slashes, even on Windows.
+        # Don't forget to use absolute paths, not relative paths.
+        os.path.join(PROJECT_ROOT, 'templates'),
+    )
+
 
 INSTALLED_APPS = (
     'django.contrib.auth',
@@ -136,10 +165,8 @@
 
     # Only needed for running unit tests
     'nocaptcha_recaptcha',
-    'django_nose',
 )
 
-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
 SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'
 
@@ -182,4 +209,4 @@
 }
 
 NORECAPTCHA_SITE_KEY = os.environ.get('NORECAPTCHA_SITE_KEY', "")
-NORECAPTCHA_SECRET_KEY = os.environ.get('NORECAPTCHA_SECRET_KEY', "")
+NORECAPTCHA_SECRET_KEY = os.environ.get('NORECAPTCHA_SECRET_KEY', "")

demo/demo/urls.py

@@ -1,13 +1,12 @@
 from django.contrib import admin
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.views.generic import TemplateView
 
 from . import views
 
 admin.autodiscover()
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
 
     url(r'^$', views.DemoView.as_view(template_name="index.html"), {},
         name="index"),
@@ -16,4 +15,4 @@
 
     # Uncomment the next line to enable the admin:
     url(r'^admin/', include(admin.site.urls)),
-)
+]

demo/requirements.txt

@@ -1,5 +1,3 @@
-Django>=1.5
-django-nose>=1.2
+Django>=1.5,<1.11
 mock>=1.0.1
-nose>=1.3.4
 six>=1.8.0

nocaptcha_recaptcha/client.py

@@ -2,9 +2,9 @@
 
 import django
 
-if django.VERSION[1] >= 5:
+try:
     import json
-else:
+except ImportError:
     from django.utils import simplejson as json
 
 from django.conf import settings

setup.py

@@ -8,7 +8,7 @@ def read(fname):
 
 setup(
     name='django-nocaptcha-recaptcha',
-    version='0.0.19',
+    version='0.0.20',
     description='Django nocaptcha recaptcha form field/widget app.',
     long_description=read('README.md'),
     author='Imaginary Landscape',
@@ -18,7 +18,6 @@ def read(fname):
     url='https://github.com/ImaginaryLandscape/django-nocaptcha-recaptcha',
     packages=find_packages(),
     tests_require=[
-        'django-setuptest>=0.1',
         'mock',
     ],
     test_suite="setuptest.setuptest.SetupTestSuite",
@@ -31,6 +30,8 @@ def read(fname):
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
     ],
     zip_safe=False,