[Python-modules-commits] [djangorestframework-gis] 06/10: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Mon Oct 17 12:10:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository djangorestframework-gis.
commit ba93c7310b18a3bba0862bdbf3e5149ca6141470
Merge: 63aac4b d583df9
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Mon Oct 17 13:54:27 2016 +0200
merge patched into master
debian/.git-dpm | 4 ++--
debian/patches/0003-Fix-URL-config-for-Django-1.8.patch | 11 ++++++-----
.../patches/0004-Add-TEMPLATES-setting-for-Django-1.8.patch | 2 +-
tests/django_restframework_gis_tests/urls.py | 2 +-
4 files changed, 10 insertions(+), 9 deletions(-)
diff --cc debian/.git-dpm
index d0ca7fa,0000000..a986b6c
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- aa7c3258ebd9f608376b8ecaed121e70b0a68156
- aa7c3258ebd9f608376b8ecaed121e70b0a68156
++d583df97edba5e5286bfd17f5b712818cd4c0bac
++d583df97edba5e5286bfd17f5b712818cd4c0bac
+8623397eb64f78e06c01bde72ff6eb77185328e2
+8623397eb64f78e06c01bde72ff6eb77185328e2
+djangorestframework-gis_0.10.1.orig.tar.gz
+f048cdeab8372d5c2f4db10d555a7d09b77315df
+26301
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Fix-URL-config-for-Django-1.8.patch
index 941c17b,0000000..ffaac98
mode 100644,000000..100644
--- a/debian/patches/0003-Fix-URL-config-for-Django-1.8.patch
+++ b/debian/patches/0003-Fix-URL-config-for-Django-1.8.patch
@@@ -1,93 -1,0 +1,94 @@@
- From 2bf0c0e008fbe2736e1182f8b88ed25061fecb8b Mon Sep 17 00:00:00 2001
++From b1f918e9e832b2275887bdad2d4f46dc8a8e7926 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Mon, 17 Oct 2016 13:43:32 +0200
+Subject: Fix URL config for Django 1.8+.
+
+---
- tests/django_restframework_gis_tests/urls.py | 46 +++++++++++++++-------------
++ tests/django_restframework_gis_tests/urls.py | 48 +++++++++++++++-------------
+ tests/urls.py | 3 +-
- 2 files changed, 26 insertions(+), 23 deletions(-)
++ 2 files changed, 27 insertions(+), 24 deletions(-)
+
+diff --git a/tests/django_restframework_gis_tests/urls.py b/tests/django_restframework_gis_tests/urls.py
- index 8df2837..8a90934 100644
++index 8df2837..2c97fd3 100644
+--- a/tests/django_restframework_gis_tests/urls.py
++++ b/tests/django_restframework_gis_tests/urls.py
+@@ -1,35 +1,37 @@
- from django.conf.urls import patterns, url
++-from django.conf.urls import patterns, url
+++from django.conf.urls import url
+
++from django_restframework_gis_tests 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'),
++]
+diff --git a/tests/urls.py b/tests/urls.py
+index 3f14318..8db5e95 100644
+--- a/tests/urls.py
++++ b/tests/urls.py
+@@ -1,5 +1,6 @@
+ from django.conf.urls import include, url
+ from django.contrib import admin
++from django.contrib.staticfiles.views import serve
+
+ admin.autodiscover()
+
+@@ -12,6 +13,6 @@ urlpatterns = [
+
+ url(r'', include('django_restframework_gis_tests.urls')),
+
+- url(r'^static/(?P<path>.*)$', 'django.contrib.staticfiles.views.serve'),
++ url(r'^static/(?P<path>.*)$', serve),
+
+ ]
diff --cc debian/patches/0004-Add-TEMPLATES-setting-for-Django-1.8.patch
index 7b57a7a,0000000..7f7a9bf
mode 100644,000000..100644
--- a/debian/patches/0004-Add-TEMPLATES-setting-for-Django-1.8.patch
+++ b/debian/patches/0004-Add-TEMPLATES-setting-for-Django-1.8.patch
@@@ -1,36 -1,0 +1,36 @@@
- From aa7c3258ebd9f608376b8ecaed121e70b0a68156 Mon Sep 17 00:00:00 2001
++From d583df97edba5e5286bfd17f5b712818cd4c0bac Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Mon, 17 Oct 2016 13:44:45 +0200
+Subject: Add TEMPLATES setting for Django 1.8+.
+
+---
+ tests/settings.py | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/tests/settings.py b/tests/settings.py
+index 0299ffc..ed1ee17 100644
+--- a/tests/settings.py
++++ b/tests/settings.py
+@@ -55,3 +55,22 @@ STATIC_URL = '/static/'
+ ANONYMOUS_USER_ID=-1
+
+ TEMPLATE_STRING_IF_INVALID = 'INVALID_TEMPLATE: %s END_INVALID_TEMPLATE'
++
++TEMPLATES = [
++ {
++ 'BACKEND': 'django.template.backends.django.DjangoTemplates',
++ 'DIRS': [],
++ 'APP_DIRS': True,
++ 'OPTIONS': {
++ 'context_processors': [
++ 'django.contrib.auth.context_processors.auth',
++ 'django.template.context_processors.debug',
++ 'django.template.context_processors.i18n',
++ 'django.template.context_processors.media',
++ 'django.template.context_processors.static',
++ 'django.template.context_processors.tz',
++ 'django.contrib.messages.context_processors.messages',
++ ],
++ },
++ },
++]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/djangorestframework-gis.git
More information about the Python-modules-commits
mailing list