[Python-modules-commits] [python-django-navtag] 06/08: Adapt test settings to new upstream path.

[Michael Fladischer]

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

fladi pushed a commit to branch debian/master
in repository python-django-navtag.

commit 3cc0b74d12894985600d596dc3b0100ec0eb1fb2
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Nov 1 20:13:26 2017 +0100

    Adapt test settings to new upstream path.
---
 debian/changelog                                   |  1 +
 ...ES-setting-to-tests-for-Django-1.10-compa.patch | 24 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       |  2 +-
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 439762b..558ac86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ python-django-navtag (2.1.2-1) UNRELEASED; urgency=low
   * New upstream release.
   * Refresh patches after git-dpm to gbp pq conversion
   * Move upstream signing key to debian/upstream/signing-key.asc.
+  * Adapt test settings to new upstream path.
 
  -- Michael Fladischer <fladi at debian.org>  Wed, 01 Nov 2017 19:40:39 +0100
 
diff --git a/debian/patches/0001-Add-TEMPLATES-setting-to-tests-for-Django-1.10-compa.patch b/debian/patches/0001-Add-TEMPLATES-setting-to-tests-for-Django-1.10-compa.patch
deleted file mode 100644
index 5ffa378..0000000
--- a/debian/patches/0001-Add-TEMPLATES-setting-to-tests-for-Django-1.10-compa.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Fladischer <FladischerMichael at fladi.at>
-Date: Fri, 19 Aug 2016 20:42:58 +0200
-Subject: Add TEMPLATES setting to tests for Django 1.10 compatibility
- (Closes: #834470).
-
----
- django_navtag/test_settings.py | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/django_navtag/test_settings.py b/django_navtag/test_settings.py
-index ffb7762..122af2c 100644
---- a/django_navtag/test_settings.py
-+++ b/django_navtag/test_settings.py
-@@ -12,3 +12,10 @@ INSTALLED_APPS = [
- ]
- 
- SECRET_KEY = 'testing'
-+
-+TEMPLATES = [
-+    {
-+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-+        'APP_DIRS': True,
-+    },
-+]
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1904340..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Add-TEMPLATES-setting-to-tests-for-Django-1.10-compa.patch
diff --git a/debian/rules b/debian/rules
index e25d59a..3a98523 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,5 +10,5 @@ export PYBUILD_NAME=django-navtag
 
 override_dh_auto_test:
 	PYTHONPATH=. \
-	DJANGO_SETTINGS_MODULE=django_navtag.test_settings \
+	DJANGO_SETTINGS_MODULE=django_navtag.tests.settings \
 	dh_auto_test -- --system=custom --test-args="{interpreter} /usr/bin/django-admin test django_navtag.tests"

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