removed django 1.7 specific settings and codes for get rid of deprecated in 1.10 warning

.travis.yml

@@ -13,12 +13,7 @@ python:
 env:
   - DJANGO="django>=1.9,<1.10"
   - DJANGO="django>=1.8,<1.9"
-  - DJANGO="django>=1.7,<1.8"
 
-matrix:
-  exclude:
-    - python: "3.5"
-      env: DJANGO="django>=1.7,<1.8"
 
 branches:
   only:
@@ -28,7 +23,6 @@ branches:
 install:
   - pip install $DJANGO
   - pip install -r requirements-test.txt
-  - if [ "$DJANGO" == "django>=1.7,<1.8" ]; then pip install django-filter==0.11.0; fi
   - python setup.py -q develop
 
 before_script:

tests/django_restframework_gis_tests/urls.py

@@ -1,35 +1,92 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
+from . import views
 
-
-urlpatterns = patterns('django_restframework_gis_tests.views',
-    url(r'^$', 'location_list', name='api_location_list'),
-    url(r'^(?P<pk>[0-9]+)/$', 'location_details', name='api_location_details'),
+urlpatterns = [
+    url(r'^$', views.location_list, name='api_location_list'),
+    url(
+        r'^(?P<pk>[0-9]+)/$',
+        views.location_details,
+        name='api_location_details'),
 
     # geojson
-    url(r'^geojson/$', 'geojson_location_list', name='api_geojson_location_list'),
-    url(r'^geojson/(?P<pk>[0-9]+)/$', 'geojson_location_details', name='api_geojson_location_details'),
-    url(r'^geojson_hidden/(?P<pk>[0-9]+)/$', 'geojson_location_details_hidden', name='api_geojson_location_details_hidden'),
-    url(r'^geojson_none/(?P<pk>[0-9]+)/$', 'geojson_location_details_none', name='api_geojson_location_details_none'),
-    url(r'^geojson/(?P<slug>[-\w]+)/$', 'geojson_location_slug_details', name='api_geojson_location_slug_details'),
-    url(r'^geojson-falseid/(?P<pk>[0-9]+)/$', 'geojson_location_falseid_details', name='api_geojson_location_falseid_details'),
-    url(r'^geojson-noid/(?P<pk>[0-9]+)/$', 'geojson_location_noid_details', name='api_geojson_location_noid_details'),
+    url(
+        r'^geojson/$',
+        views.geojson_location_list,
+        name='api_geojson_location_list'),
+    url(
+        r'^geojson/(?P<pk>[0-9]+)/$',
+        views.geojson_location_details,
+        name='api_geojson_location_details'),
+    url(
+        r'^geojson_hidden/(?P<pk>[0-9]+)/$',
+        views.geojson_location_details_hidden,
+        name='api_geojson_location_details_hidden'),
+    url(
+        r'^geojson_none/(?P<pk>[0-9]+)/$',
+        views.geojson_location_details_none,
+        name='api_geojson_location_details_none'),
+    url(
+        r'^geojson/(?P<slug>[-\w]+)/$',
+        views.geojson_location_slug_details,
+        name='api_geojson_location_slug_details'),
+    url(
+        r'^geojson-falseid/(?P<pk>[0-9]+)/$',
+        views.geojson_location_falseid_details,
+        name='api_geojson_location_falseid_details'),
+    url(
+        r'^geojson-noid/(?P<pk>[0-9]+)/$',
+        views.geojson_location_noid_details,
+        name='api_geojson_location_noid_details'),
 
     # file
-    url(r'^geojson-file/(?P<pk>[0-9]+)/$', 'geojson_located_file_details', name='api_geojson_located_file_details'),
+    url(
+        r'^geojson-file/(?P<pk>[0-9]+)/$',
+        views.geojson_located_file_details,
+        name='api_geojson_located_file_details'),
 
     # geojson with bbox with its own geometry field
-    url(r'^geojson-with-bbox/$', 'geojson_boxedlocation_list', name='api_geojson_boxedlocation_list'),
-    url(r'^geojson-with-bbox/(?P<pk>[0-9]+)/$', 'geojson_boxedlocation_details', name='api_geojson_boxedlocation_details'),
+    url(
+        r'^geojson-with-bbox/$',
+        views.geojson_boxedlocation_list,
+        name='api_geojson_boxedlocation_list'),
+    url(
+        r'^geojson-with-bbox/(?P<pk>[0-9]+)/$',
+        views.geojson_boxedlocation_details,
+        name='api_geojson_boxedlocation_details'),
 
     # geojson with bbox with autogenerated bbox
-    url(r'^geojson-with-auto-bbox/$', 'geojson_location_bbox_list', name='api_geojson_location_bbox_list'),
+    url(
+        r'^geojson-with-auto-bbox/$',
+        views.geojson_location_bbox_list,
+        name='api_geojson_location_bbox_list'),
 
     # Filters
-    url(r'^filters/contained_in_bbox$', 'geojson_location_contained_in_bbox_list', name='api_geojson_location_list_contained_in_bbox_filter'),
-    url(r'^filters/overlaps_bbox$', 'geojson_location_overlaps_bbox_list', name='api_geojson_location_list_overlaps_bbox_filter'),
-    url(r'^filters/contained_in_geometry$', 'geojson_contained_in_geometry', name='api_geojson_contained_in_geometry'),
-    url(r'^filters/contained_in_tile$', 'geojson_location_contained_in_tile_list', name='api_geojson_location_list_contained_in_tile_filter'),
-    url(r'^filters/overlaps_tile$', 'geojson_location_overlaps_tile_list', name='api_geojson_location_list_overlaps_tile_filter'),
-    url(r'^filters/within_distance_of_point$', 'geojson_location_within_distance_of_point_list', name='api_geojson_location_list_within_distance_of_point_filter'),
-    url(r'^filters/within_degrees_of_point$', 'geojson_location_within_degrees_of_point_list', name='api_geojson_location_list_within_degrees_of_point_filter'),
-)
+    url(
+        r'^filters/contained_in_bbox$',
+        views.geojson_location_contained_in_bbox_list,
+        name='api_geojson_location_list_contained_in_bbox_filter'),
+    url(
+        r'^filters/overlaps_bbox$',
+        views.geojson_location_overlaps_bbox_list,
+        name='api_geojson_location_list_overlaps_bbox_filter'),
+    url(
+        r'^filters/contained_in_geometry$',
+        views.geojson_contained_in_geometry,
+        name='api_geojson_contained_in_geometry'),
+    url(
+        r'^filters/contained_in_tile$',
+        views.geojson_location_contained_in_tile_list,
+        name='api_geojson_location_list_contained_in_tile_filter'),
+    url(
+        r'^filters/overlaps_tile$',
+        views.geojson_location_overlaps_tile_list,
+        name='api_geojson_location_list_overlaps_tile_filter'),
+    url(
+        r'^filters/within_distance_of_point$',
+        views.geojson_location_within_distance_of_point_list,
+        name='api_geojson_location_list_within_distance_of_point_filter'),
+    url(
+        r'^filters/within_degrees_of_point$',
+        views.geojson_location_within_degrees_of_point_list,
+        name='api_geojson_location_list_within_degrees_of_point_filter'),
+]

tests/urls.py

@@ -1,8 +1,6 @@
 from django.conf.urls import include, url
 from django.contrib import admin
-
-admin.autodiscover()
-
+from django.contrib.staticfiles import views
 
 urlpatterns = [
     # Uncomment the next line to enable the admin:
@@ -12,6 +10,6 @@
 
     url(r'', include('django_restframework_gis_tests.urls')),
 
-    url(r'^static/(?P<path>.*)$', 'django.contrib.staticfiles.views.serve'),
+    url(r'^static/(?P<path>.*)$', views.serve),
 
 ]