[Python-modules-commits] [djangorestframework-gis] 06/08: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Wed Nov 23 21:05:49 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 e1563b6ce764bae0dabcbb432f0e9c73298b481d
Merge: a6186ab a00e23a
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Wed Nov 23 20:52:35 2016 +0100
merge patched into master
AUTHORS | 1 +
CHANGES.rst | 8 ++
PKG-INFO | 2 +-
README.rst | 11 ++-
debian/.git-dpm | 6 +-
...02-Do-not-import-local-settings-for-tests.patch | 6 +-
...003-Add-TEMPLATES-setting-for-Django-1.8.patch} | 6 +-
.../0003-Fix-URL-config-for-Django-1.8.patch | 94 --------------------
debian/patches/series | 3 +-
debian/patches/spatialite.patch | 6 +-
djangorestframework_gis.egg-info/PKG-INFO | 2 +-
djangorestframework_gis.egg-info/SOURCES.txt | 4 +-
djangorestframework_gis.egg-info/requires.txt | 2 +-
requirements.txt | 2 +-
rest_framework_gis/__init__.py | 2 +-
rest_framework_gis/filters.py | 6 +-
setup.cfg | 2 +-
.../migrations/0001_initial.py | 58 +++++++++++++
.../migrations/__init__.py | 0
.../django_restframework_gis_tests/serializers.py | 6 ++
tests/django_restframework_gis_tests/tests.py | 4 +-
tests/django_restframework_gis_tests/urls.py | 99 +++++++++++++++++-----
tests/local_settings.py | 1 +
tests/settings.py | 20 +++++
tests/urls.py | 7 +-
25 files changed, 209 insertions(+), 149 deletions(-)
diff --cc debian/.git-dpm
index 60b975b,0000000..f2e9b82
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
- d583df97edba5e5286bfd17f5b712818cd4c0bac
- d583df97edba5e5286bfd17f5b712818cd4c0bac
- 8623397eb64f78e06c01bde72ff6eb77185328e2
++a00e23a9013ec37e22dbf739909d31c94b52711e
++a00e23a9013ec37e22dbf739909d31c94b52711e
++5fd992e9c7cd507886df9266d61631d81cbfc90e
+5fd992e9c7cd507886df9266d61631d81cbfc90e
+djangorestframework-gis_0.11.orig.tar.gz
+5f83223fd778587e3206d61203bf5b8e9a008e35
+27285
+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 10ed8ec,0000000..8ab1a35
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 f87e07883c1e34ec00586079ac524c922de288df Mon Sep 17 00:00:00 2001
++From a54af50f2774f3ca35fa4326c0bcf84dd3325d44 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
++index c628f97..0fb4e30 100644
+--- a/tests/settings.py
++++ b/tests/settings.py
- @@ -55,9 +55,3 @@ STATIC_URL = '/static/'
++@@ -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 7f7a9bf,0000000..69764ec
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 d583df97edba5e5286bfd17f5b712818cd4c0bac Mon Sep 17 00:00:00 2001
++From a00e23a9013ec37e22dbf739909d31c94b52711e 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
++index 0fb4e30..a419f71 100644
+--- a/tests/settings.py
++++ b/tests/settings.py
- @@ -55,3 +55,22 @@ STATIC_URL = '/static/'
++@@ -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/series
index 2a4d37a,0000000..7fd7909
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,3 @@@
+spatialite.patch
+0002-Do-not-import-local-settings-for-tests.patch
- 0003-Fix-URL-config-for-Django-1.8.patch
- 0004-Add-TEMPLATES-setting-for-Django-1.8.patch
++0003-Add-TEMPLATES-setting-for-Django-1.8.patch
diff --cc debian/patches/spatialite.patch
index f7f424e,0000000..053d94b
mode 100644,000000..100644
--- a/debian/patches/spatialite.patch
+++ b/debian/patches/spatialite.patch
@@@ -1,53 -1,0 +1,53 @@@
- From bac492a7f71395bf70133163a7dbbc765ac0dd23 Mon Sep 17 00:00:00 2001
++From 7695f49eb8ecce08ba1c036f94416114710fd7b6 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 150eb82..d9edb92 100644
++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 = (
- @@ -52,6 +52,8 @@ MEDIA_URL = '/media/'
++@@ -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