[Python-modules-commits] [django-nose] 09/14: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to annotated tag debian/1.4.2-1
in repository django-nose.

commit 0171c08a254ab6b2d115ee816f6f4b30dfe5bfb7
Merge: 662f34e 54c9860
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Oct 16 12:27:38 2015 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...unnecessary-dependency-on-dj_database_url.patch | 39 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 testapp/settings.py                                | 14 +++-----
 4 files changed, 46 insertions(+), 12 deletions(-)

diff --cc debian/.git-dpm
index f8d8d58,0000000..1135732
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
- 6485660bd36b36aa6c0b57dda7dc41d3b39d6176
- 6485660bd36b36aa6c0b57dda7dc41d3b39d6176
++54c9860588c07c9e092079c09f9de987abc26f00
++54c9860588c07c9e092079c09f9de987abc26f00
 +4ee0cc56a19788fb299a20d2f63e361a7caf0927
 +4ee0cc56a19788fb299a20d2f63e361a7caf0927
 +django-nose_1.4.2.orig.tar.gz
 +37c3131913e6be9f4cbfeebbc86a563b1f3955bf
 +41800
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Remove-unnecessary-dependency-on-dj_database_url.patch
index 0000000,0000000..be8d55d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Remove-unnecessary-dependency-on-dj_database_url.patch
@@@ -1,0 -1,0 +1,39 @@@
++From 54c9860588c07c9e092079c09f9de987abc26f00 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Fri, 16 Oct 2015 12:26:16 +0200
++Subject: Remove unnecessary dependency on dj_database_url.
++
++Importing dj_database_url for a simple test application is not necessary,
++replace the static database configuration with a defautl one from Django.
++---
++ testapp/settings.py | 14 ++++----------
++ 1 file changed, 4 insertions(+), 10 deletions(-)
++
++diff --git a/testapp/settings.py b/testapp/settings.py
++index d204545..9059560 100644
++--- a/testapp/settings.py
+++++ b/testapp/settings.py
++@@ -11,19 +11,13 @@ NOSE_PLUGINS - Comma-separated list of plugins to add
++ from __future__ import print_function
++ from os import environ, path
++ 
++-import dj_database_url
++-
++ BASE_DIR = path.dirname(path.dirname(__file__))
++ 
++-
++-def rel_path(*subpaths):
++-    """Construct the full path given a relative path."""
++-    return path.join(BASE_DIR, *subpaths)
++-
++ DATABASES = {
++-    'default':
++-        dj_database_url.config(
++-            default='sqlite:///' + rel_path('testapp.sqlite3'))
+++    'default': {
+++        'ENGINE': 'django.db.backends.sqlite3',
+++        'NAME': path.join(BASE_DIR, 'testapp.sqlite3'),
+++    }
++ }
++ 
++ MIDDLEWARE_CLASSES = ()
diff --cc debian/patches/series
index e0b29f8,0000000..0b91c13
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +django17.patch
 +runtests.patch
++0003-Remove-unnecessary-dependency-on-dj_database_url.patch

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