Merge pull request #109 from auvipy/up

versions upgrade and obsolete versions removal

.travis.yml

@@ -2,11 +2,24 @@ language: python
 python: 
     - "2.7"
     - "3.4"
+    - "3.5"
 env:
-    - DJANGO="Django>=1.6.0,<1.7.0"
     - DJANGO="Django>=1.7.0,<1.8.0"
     - DJANGO="Django>=1.8.0,<1.9.0"
     - DJANGO="Django>=1.9.0,<1.10.0"
+    - DJANGO="Django>=1.10a1,<1.11.0"
+
+matrix:
+  allow_failures:
+    - python: "2.7"
+      env: DJANGO="Django>=1.10a1,<1.11.0"
+    - python: "3.4"
+      env: DJANGO="Django>=1.10a1,<1.11.0"
+    - python: "3.5"
+      env: DJANGO="Django>=1.10a1,<1.11.0"
+
+
+  fast_finish: true
 
 install:
     - pip install -q $DJANGO

project/example_app/urls.py

@@ -1,4 +1,6 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
+from . import views
 
-urlpatterns = patterns('example_app.views',
-                       url(r'^$', 'index', name='index'))
+urlpatterns = [
+                url(r'^$', views.index, name='index')
+            ]

project/project/urls.py

@@ -1,20 +1,33 @@
 from django.conf import settings
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.contrib import admin
 from django.conf.urls.static import static
+from django.contrib.auth import views
 
-admin.autodiscover()
 
-urlpatterns = patterns('',
-                       url(r'^silk/', include('silk.urls', namespace='silk', app_name='silk')),
-                       url(r'^example_app/', include('example_app.urls', namespace='example_app', app_name='example_app')),
-                       url(r'^admin/', include(admin.site.urls)),
 
-)
+urlpatterns = [
+    url(
+    	r'^silk/',
+    	include('silk.urls', namespace='silk', app_name='silk')
+    	),
+    url(
+    	r'^example_app/',
+    	include('example_app.urls', namespace='example_app', app_name='example_app')
+    	),
+    url(r'^admin/', include(admin.site.urls)),
+]
+
+
+
+urlpatterns += [
+    url(
+    	r'^login/$',
+    	views.login, 
+    	{'template_name': 'example_app/login.html'}, name='login'),
+]
+
 
-urlpatterns += patterns('',
-                       url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'example_app/login.html'}, name='login'),
-                       )
 
 urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) + \
               static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

requirements.txt

@@ -1,12 +1,12 @@
 Pygments>=2.0,<2.1
 python-dateutil>=2.4,<2.5
-requests==2.2.1
+requests==2.10
 sqlparse==0.1.11
-Jinja2==2.7.2
+Jinja2==2.8
 autopep8==1.2.1
 pytz>2014.2
 mock==1.0.1
-Pillow==2.5.1
+Pillow==3.2
 south>=1.0
 django>=1.8
 freezegun>=0.3,<0.4

setup.py

@@ -25,8 +25,8 @@
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],