[Python-modules-commits] [djangorestframework-gis] 10/12: merge patched into master

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository djangorestframework-gis.

commit 6065a2542e6960bda6e18e6cd486f314bbc8a61a
Merge: dd2ef27 f87e078
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Jan 7 12:23:29 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...02-Do-not-import-local-settings-for-tests.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/patches/spatialite.patch                    |  5 ++---
 tests/settings.py                                  |  6 ------
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --cc debian/.git-dpm
index 0b3affd,0000000..1eb195b
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
- 59da011543ca6ff5176851faed9708b5ab0ad1c5
- 59da011543ca6ff5176851faed9708b5ab0ad1c5
++f87e07883c1e34ec00586079ac524c922de288df
++f87e07883c1e34ec00586079ac524c922de288df
 +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/0002-Do-not-import-local-settings-for-tests.patch
index 0000000,0000000..10ed8ec
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Do-not-import-local-settings-for-tests.patch
@@@ -1,0 -1,0 +1,23 @@@
++From f87e07883c1e34ec00586079ac524c922de288df 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 d9edb92..0299ffc 100644
++--- a/tests/settings.py
+++++ b/tests/settings.py
++@@ -55,9 +55,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/series
index 250d438,0000000..e5c0d64
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +spatialite.patch
++0002-Do-not-import-local-settings-for-tests.patch
diff --cc debian/patches/spatialite.patch
index aa72e43,0000000..f7f424e
mode 100644,000000..100644
--- a/debian/patches/spatialite.patch
+++ b/debian/patches/spatialite.patch
@@@ -1,54 -1,0 +1,53 @@@
- From 59da011543ca6ff5176851faed9708b5ab0ad1c5 Mon Sep 17 00:00:00 2001
++From bac492a7f71395bf70133163a7dbbc765ac0dd23 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Thu, 8 Oct 2015 08:58:54 -0700
- Subject: Disable tests that only work with PostGIS
++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
- Last-Update: 2014-10-12
 +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 150eb82..d9edb92 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 = (
 +@@ -52,6 +52,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