[Python-modules-commits] [djangorestframework-gis] 01/03: Convert from git-dpm to patches unapplied format

[Michael Fladischer]

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

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

commit 88c699199704bd8474903b0236a614f79464507e
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Aug 4 20:37:43 2017 +0200

    Convert from git-dpm to patches unapplied format
---
 debian/.git-dpm   | 11 -----------
 debian/gbp.conf   |  2 ++
 tests/settings.py | 37 +++++++++++--------------------------
 3 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index 129b202..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-ddebe683135f9a43cbaa14ff3d37f6084b41c2fc
-ddebe683135f9a43cbaa14ff3d37f6084b41c2fc
-f7c155b8b2740357a5ff6b1e52f3e45aaf9da388
-f7c155b8b2740357a5ff6b1e52f3e45aaf9da388
-djangorestframework-gis_0.11.2.orig.tar.gz
-33a0512c6037cf77e98f2f67fae7262057f1a7d3
-27821
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..3879982
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/master
diff --git a/tests/settings.py b/tests/settings.py
index a419f71..39b5df0 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -7,15 +7,15 @@ TEMPLATE_DEBUG = DEBUG
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.contrib.gis.db.backends.spatialite',
-        'NAME': 'test.db',
+        'ENGINE': 'django.contrib.gis.db.backends.postgis',
+        'NAME': 'django_restframework_gis',
+        'USER': 'postgres',
+        'PASSWORD': 'postgres',
+        'HOST': '',
+        'PORT': ''
     },
 }
 
-# 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,25 +72,10 @@ 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'
 
-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',
-            ],
-        },
-    },
-]
+# local settings must be imported before test runner otherwise they'll be ignored
+try:
+    from local_settings import *
+except ImportError:
+    pass

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/djangorestframework-gis.git