[Python-modules-commits] [django-polymorphic] 02/05: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Sun Aug 21 11:24:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository django-polymorphic.
commit 67e257bf32fa680236f29e733bfd03403387cb8b
Merge: 74a2148 661f971
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Sun Aug 21 13:08:34 2016 +0200
merge patched into master
debian/.git-dpm | 4 +-
...parate-test-configuration-for-Django-1.10.patch | 124 +++++++++++++++++++++
debian/patches/series | 1 +
runtests.py | 103 +++++++++++------
4 files changed, 199 insertions(+), 33 deletions(-)
diff --cc debian/.git-dpm
index 5ef5da0,0000000..bc376e3
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
- d95b26a48a4bb5c234781c000b2ef40933f5e20c
- d95b26a48a4bb5c234781c000b2ef40933f5e20c
++661f9712cac2ca128abd892cf10c3c37181a6569
++661f9712cac2ca128abd892cf10c3c37181a6569
+d95b26a48a4bb5c234781c000b2ef40933f5e20c
+d95b26a48a4bb5c234781c000b2ef40933f5e20c
+django-polymorphic_0.9.2.orig.tar.gz
+7ec1267dedc7e560889d93ac304dffc5001dd3a2
+69159
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Add-separate-test-configuration-for-Django-1.10.patch
index 0000000,0000000..beae87e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Add-separate-test-configuration-for-Django-1.10.patch
@@@ -1,0 -1,0 +1,124 @@@
++From 661f9712cac2ca128abd892cf10c3c37181a6569 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Fri, 12 Aug 2016 13:10:53 +0200
++Subject: Add separate test configuration for Django 1.10.
++
++This is necessary because TEMPLATES configuration is now mandatory.
++---
++ runtests.py | 103 ++++++++++++++++++++++++++++++++++++++++++------------------
++ 1 file changed, 72 insertions(+), 31 deletions(-)
++
++diff --git a/runtests.py b/runtests.py
++index f9517d2..680cfb9 100755
++--- a/runtests.py
+++++ b/runtests.py
++@@ -18,37 +18,78 @@ sys.stderr.write('Using Django version {0} from {1}\n'.format(
++ )
++
++ if not settings.configured:
++- settings.configure(
++- DEBUG=True,
++- TEMPLATE_DEBUG=True,
++- DATABASES={
++- 'default': {
++- 'ENGINE': 'django.db.backends.sqlite3',
++- 'NAME': ':memory:'
++- }
++- },
++- TEMPLATE_LOADERS=(
++- 'django.template.loaders.app_directories.Loader',
++- ),
++- TEMPLATE_CONTEXT_PROCESSORS=(
++- # list() is only needed for older versions of django where this is
++- # a tuple:
++- list(default_settings.TEMPLATE_CONTEXT_PROCESSORS) + [
++- 'django.core.context_processors.request',
++- ]
++- ),
++- TEST_RUNNER = 'django.test.runner.DiscoverRunner' if django.VERSION >= (1, 7) else 'django.test.simple.DjangoTestSuiteRunner',
++- INSTALLED_APPS = (
++- 'django.contrib.auth',
++- 'django.contrib.contenttypes',
++- 'django.contrib.messages',
++- 'django.contrib.sites',
++- 'django.contrib.admin',
++- 'polymorphic',
++- ),
++- MIDDLEWARE_CLASSES = (),
++- SITE_ID = 3,
++- )
+++ if django.VERSION < (1, 10):
+++ settings.configure(
+++ DEBUG=True,
+++ TEMPLATE_DEBUG=True,
+++ DATABASES={
+++ 'default': {
+++ 'ENGINE': 'django.db.backends.sqlite3',
+++ 'NAME': ':memory:'
+++ }
+++ },
+++ TEMPLATE_LOADERS=(
+++ 'django.template.loaders.app_directories.Loader',
+++ ),
+++ TEMPLATE_CONTEXT_PROCESSORS=(
+++ # list() is only needed for older versions of django where this is
+++ # a tuple:
+++ list(default_settings.TEMPLATE_CONTEXT_PROCESSORS) + [
+++ 'django.core.context_processors.request',
+++ ]
+++ ),
+++ TEST_RUNNER = 'django.test.runner.DiscoverRunner' if django.VERSION >= (1, 7) else 'django.test.simple.DjangoTestSuiteRunner',
+++ INSTALLED_APPS = (
+++ 'django.contrib.auth',
+++ 'django.contrib.contenttypes',
+++ 'django.contrib.messages',
+++ 'django.contrib.sites',
+++ 'django.contrib.admin',
+++ 'polymorphic',
+++ ),
+++ MIDDLEWARE_CLASSES = (),
+++ SITE_ID = 3,
+++ )
+++ else:
+++ settings.configure(
+++ DEBUG=True,
+++ DATABASES={
+++ 'default': {
+++ 'ENGINE': 'django.db.backends.sqlite3',
+++ 'NAME': ':memory:'
+++ }
+++ },
+++ TEST_RUNNER = 'django.test.runner.DiscoverRunner',
+++ INSTALLED_APPS = (
+++ 'django.contrib.auth',
+++ 'django.contrib.contenttypes',
+++ 'django.contrib.messages',
+++ 'django.contrib.sites',
+++ 'django.contrib.admin',
+++ 'polymorphic',
+++ ),
+++ MIDDLEWARE_CLASSES = (),
+++ SITE_ID = 3,
+++ 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.template.context_processors.request',
+++ 'django.contrib.messages.context_processors.messages',
+++ ],
+++ },
+++ },
+++ ],
+++ )
++
++ DEFAULT_TEST_APPS = [
++ 'polymorphic',
diff --cc debian/patches/series
index 0000000,0000000..3209344
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Add-separate-test-configuration-for-Django-1.10.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-polymorphic.git
More information about the Python-modules-commits
mailing list