[Python-modules-commits] [djangorestframework-gis] 06/09: merge patched-experimental into experimental
Michael Fladischer
fladi at moszumanska.debian.org
Fri May 12 18:33:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch experimental
in repository djangorestframework-gis.
commit 328385ccb978dd6daa7416b570f98523ea672e7f
Merge: 142da85 6d233b6
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Fri May 12 20:01:25 2017 +0200
merge patched-experimental into experimental
CHANGES.rst | 6 ++++++
PKG-INFO | 2 +-
README.rst | 16 ++++++++--------
debian/.git-dpm | 6 +++---
.../0002-Do-not-import-local-settings-for-tests.patch | 2 +-
.../0003-Add-TEMPLATES-setting-for-Django-1.8.patch | 2 +-
debian/patches/spatialite.patch | 2 +-
djangorestframework_gis.egg-info/PKG-INFO | 2 +-
djangorestframework_gis.egg-info/requires.txt | 2 +-
requirements.txt | 2 +-
rest_framework_gis/__init__.py | 2 +-
rest_framework_gis/serializers.py | 4 ++--
setup.cfg | 3 +--
setup.py | 4 +++-
tests/django_restframework_gis_tests/serializers.py | 6 +++---
tests/django_restframework_gis_tests/views.py | 4 +++-
16 files changed, 37 insertions(+), 28 deletions(-)
diff --cc debian/.git-dpm
index a1450bb,0000000..3339447
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
- a00e23a9013ec37e22dbf739909d31c94b52711e
- a00e23a9013ec37e22dbf739909d31c94b52711e
- 5fd992e9c7cd507886df9266d61631d81cbfc90e
++6d233b6157cdd310e065d9b6a823a041999ed9ab
++6d233b6157cdd310e065d9b6a823a041999ed9ab
++7cb183ba6e670f84ceaab76b69253abd39aea136
+7cb183ba6e670f84ceaab76b69253abd39aea136
+djangorestframework-gis_0.11.1.orig.tar.gz
+412cf7fd73bfb0302e9293c97c57710898a8efce
+27361
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Do-not-import-local-settings-for-tests.patch
index 8ab1a35,0000000..388b4b6
mode 100644,000000..100644
--- a/debian/patches/0002-Do-not-import-local-settings-for-tests.patch
+++ b/debian/patches/0002-Do-not-import-local-settings-for-tests.patch
@@@ -1,23 -1,0 +1,23 @@@
- From a54af50f2774f3ca35fa4326c0bcf84dd3325d44 Mon Sep 17 00:00:00 2001
++From a0af8d352d0497a3169c501111d331ba577870c3 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Thu, 7 Jan 2016 12:23:10 +0100
+Subject: Do not import local settings for tests.
+
+---
+ tests/settings.py | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/tests/settings.py b/tests/settings.py
+index c628f97..0fb4e30 100644
+--- a/tests/settings.py
++++ b/tests/settings.py
+@@ -75,9 +75,3 @@ STATIC_URL = '/static/'
+ ANONYMOUS_USER_ID=-1
+
+ TEMPLATE_STRING_IF_INVALID = 'INVALID_TEMPLATE: %s END_INVALID_TEMPLATE'
+-
+-# local settings must be imported before test runner otherwise they'll be ignored
+-try:
+- from local_settings import *
+-except ImportError:
+- pass
diff --cc debian/patches/0003-Add-TEMPLATES-setting-for-Django-1.8.patch
index 69764ec,0000000..d03e4c0
mode 100644,000000..100644
--- a/debian/patches/0003-Add-TEMPLATES-setting-for-Django-1.8.patch
+++ b/debian/patches/0003-Add-TEMPLATES-setting-for-Django-1.8.patch
@@@ -1,36 -1,0 +1,36 @@@
- From a00e23a9013ec37e22dbf739909d31c94b52711e Mon Sep 17 00:00:00 2001
++From 6d233b6157cdd310e065d9b6a823a041999ed9ab 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 0fb4e30..a419f71 100644
+--- a/tests/settings.py
++++ b/tests/settings.py
+@@ -75,3 +75,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',
++ ],
++ },
++ },
++]
diff --cc debian/patches/spatialite.patch
index 053d94b,0000000..e6d533a
mode 100644,000000..100644
--- a/debian/patches/spatialite.patch
+++ b/debian/patches/spatialite.patch
@@@ -1,53 -1,0 +1,53 @@@
- From 7695f49eb8ecce08ba1c036f94416114710fd7b6 Mon Sep 17 00:00:00 2001
++From 0b06141202a2b9164f58fa721a37a32d0f4c3419 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:58:54 -0700
+Subject: Use spatialite backend for tests.
+
+ Some of the upstream tests are designed to test features only supported on a
+ PostGIS enable database. To make the tests run with an embedded spatialite
+ database, those tests are skipped if the database connection ist not done using
+ the PostGIS driver.
+ See the following URL for a compatibility matrix:
+ https://docs.djangoproject.com/en/1.7/ref/contrib/gis/db-api/#compatibility-tables
+Forwarded: not-needed
+
+Patch-Name: spatialite.patch
+---
+ tests/settings.py | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/tests/settings.py b/tests/settings.py
+index 39b5df0..c628f97 100644
+--- a/tests/settings.py
++++ b/tests/settings.py
+@@ -7,15 +7,15 @@ TEMPLATE_DEBUG = DEBUG
+
+ DATABASES = {
+ 'default': {
+- 'ENGINE': 'django.contrib.gis.db.backends.postgis',
+- 'NAME': 'django_restframework_gis',
+- 'USER': 'postgres',
+- 'PASSWORD': 'postgres',
+- 'HOST': '',
+- 'PORT': ''
++ 'ENGINE': 'django.contrib.gis.db.backends.spatialite',
++ 'NAME': 'test.db',
+ },
+ }
+
++# Support mod_spatialite:
++# https://code.djangoproject.com/ticket/23901
++SPATIALITE_LIBRARY_PATH = 'mod_spatialite'
++
+ SECRET_KEY = 'fn)t*+$)ugeyip6-#txyy$5wf2ervc0d2n#h)qb)y5 at ly$t*@w'
+
+ INSTALLED_APPS = (
+@@ -72,6 +72,8 @@ MEDIA_URL = '/media/'
+ STATIC_ROOT = '%s/static/' % SITE_ROOT
+ STATIC_URL = '/static/'
+
++ANONYMOUS_USER_ID=-1
++
+ TEMPLATE_STRING_IF_INVALID = 'INVALID_TEMPLATE: %s END_INVALID_TEMPLATE'
+
+ # local settings must be imported before test runner otherwise they'll be ignored
--
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