[Python-modules-commits] [djangorestframework-gis] 06/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 7531df04d2f1a56d4c28db10a64125db3edae4ea
Merge: 646b893 59da011
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Jan 7 11:37:56 2016 +0100

    merge patched into master

 .coveragerc                                        |  3 --
 .gitignore                                         | 13 -----
 .travis.yml                                        | 42 ----------------
 CHANGES.rst                                        |  7 +++
 CONTRIBUTING.rst                                   |  5 --
 MANIFEST.in                                        | 10 ++--
 PKG-INFO                                           | 25 ++++++++++
 README.rst                                         |  4 +-
 debian/.git-dpm                                    |  6 +--
 debian/patches/series                              |  1 -
 debian/patches/skip_tests_spatialite.patch         | 57 ----------------------
 debian/patches/spatialite.patch                    |  2 +-
 djangorestframework_gis.egg-info/PKG-INFO          | 25 ++++++++++
 djangorestframework_gis.egg-info/SOURCES.txt       | 38 +++++++++++++++
 .../dependency_links.txt                           |  1 +
 djangorestframework_gis.egg-info/requires.txt      |  1 +
 djangorestframework_gis.egg-info/top_level.txt     |  1 +
 performance_tests.rst                              | 33 -------------
 requirements-test.txt                              |  6 ---
 rest_framework_gis/.gitignore                      |  1 -
 rest_framework_gis/__init__.py                     |  2 +-
 setup.cfg                                          |  8 ++-
 .../django_restframework_gis_tests/test_filters.py |  9 ++--
 tests/local_settings.py                            | 50 +++++++++++++++++++
 24 files changed, 175 insertions(+), 175 deletions(-)

diff --cc debian/.git-dpm
index b706fc0,0000000..0b3affd
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
- 886774f13b4dbe4bcb809d4473e51d3e0914f561
- 886774f13b4dbe4bcb809d4473e51d3e0914f561
- 24f848a5f020c5318537e3814c5598cf279c2092
++59da011543ca6ff5176851faed9708b5ab0ad1c5
++59da011543ca6ff5176851faed9708b5ab0ad1c5
++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/series
index 767e08a,0000000..250d438
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +spatialite.patch
- skip_tests_spatialite.patch
diff --cc debian/patches/spatialite.patch
index d9b1168,0000000..aa72e43
mode 100644,000000..100644
--- a/debian/patches/spatialite.patch
+++ b/debian/patches/spatialite.patch
@@@ -1,54 -1,0 +1,54 @@@
- From 276b90a8e70110125e94b2ed8e591308f35abdc2 Mon Sep 17 00:00:00 2001
++From 59da011543ca6ff5176851faed9708b5ab0ad1c5 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
 +
 + 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