[Python-modules-commits] [django-nose] 12/14: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Fri Oct 16 16:43:32 UTC 2015
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 10c94cc226e096fa27447bedc7e1ede633f1836d
Merge: 0171c08 2790fc2
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Fri Oct 16 12:59:58 2015 +0200
merge patched into master
debian/.git-dpm | 4 ++--
...Remove-unnecessary-dependency-on-dj_database_url.patch | 2 +-
debian/patches/runtests.patch | 15 +++++++++------
runtests.sh | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
diff --cc debian/.git-dpm
index 1135732,0000000..4f5d0e0
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
- 54c9860588c07c9e092079c09f9de987abc26f00
- 54c9860588c07c9e092079c09f9de987abc26f00
++2790fc210342b770f5aad012f0d445d4087da926
++2790fc210342b770f5aad012f0d445d4087da926
+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 be8d55d,0000000..275f575
mode 100644,000000..100644
--- a/debian/patches/0003-Remove-unnecessary-dependency-on-dj_database_url.patch
+++ b/debian/patches/0003-Remove-unnecessary-dependency-on-dj_database_url.patch
@@@ -1,39 -1,0 +1,39 @@@
- From 54c9860588c07c9e092079c09f9de987abc26f00 Mon Sep 17 00:00:00 2001
++From 2790fc210342b770f5aad012f0d445d4087da926 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/runtests.patch
index c1f20f0,0000000..aa8aff9
mode 100644,000000..100644
--- a/debian/patches/runtests.patch
+++ b/debian/patches/runtests.patch
@@@ -1,90 -1,0 +1,93 @@@
- From 6485660bd36b36aa6c0b57dda7dc41d3b39d6176 Mon Sep 17 00:00:00 2001
++From a439c23f43f0b86743c1b821c6d148f4af823f1b Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:54:28 -0700
+Subject: Enable non-default python versions for test runs
+
+ The original version of runtests.sh only allows to run the tests on the current
+ default python version. This patch add the environment variable PYTHON that can
+ be set to a specific python binary (e.g. python2.6) to run the tests with.
+ It also changes the path for django-admin.py to the one supplied by the
+ python-django package.
+Last-Update: 2011-11-26
+Forwarded: no
+
+Patch-Name: runtests.patch
+---
- runtests.sh | 27 ++++++++++++++++-----------
- 1 file changed, 16 insertions(+), 11 deletions(-)
++ runtests.sh | 29 +++++++++++++++++------------
++ 1 file changed, 17 insertions(+), 12 deletions(-)
+
+diff --git a/runtests.sh b/runtests.sh
- index 38a01f0..e4d6338 100755
++index 38a01f0..27cdb85 100755
+--- a/runtests.sh
++++ b/runtests.sh
- @@ -36,6 +36,11 @@ then
++@@ -36,8 +36,13 @@ then
+ fi
+
+ export PYTHONPATH=.
++if [ -z $PYTHON ]; then
++ export PYTHON=python
++fi
++
++export DJANGO_SETTINGS_MODULE=testapp.settings
+
- HAS_HOTSHOT=$(python -c "\
++-HAS_HOTSHOT=$(python -c "\
+++HAS_HOTSHOT=$($PYTHON -c "\
+ try:
++ import hotshot
++ except ImportError:
+@@ -147,44 +152,44 @@ django_test() {
+ TESTAPP_COUNT=6
+
+ reset_env
+-django_test "./manage.py test $NOINPUT" $TESTAPP_COUNT 'normal settings'
++django_test "$PYTHON /usr/bin/django-admin test $NOINPUT" $TESTAPP_COUNT 'normal settings'
+
+-DJANGO_VERSION=`./manage.py version | cut -d. -f1-2`
++DJANGO_VERSION=`$PYTHON /usr/bin/django-admin version | cut -d. -f1-2`
+ if [ "$DJANGO_VERSION" = "1.4" -o "$DJANGO_VERSION" = "1.5" -o "$DJANGO_VERSION" = "1.6" ]
+ then
+ reset_env
+ export USE_SOUTH=1
+- django_test "./manage.py test $NOINPUT" $TESTAPP_COUNT 'with south in installed apps'
++ django_test "$PYTHON /usr/bin/django-admin test $NOINPUT" $TESTAPP_COUNT 'with south in installed apps'
+ fi
+
+ reset_env
+ export TEST_RUNNER="django_nose.run_tests"
+-django_test "./manage.py test $NOINPUT" $TESTAPP_COUNT 'django_nose.run_tests format'
++django_test "$PYTHON /usr/bin/django-admin test $NOINPUT" $TESTAPP_COUNT 'django_nose.run_tests format'
+
+ reset_env
+-django_test "testapp/runtests.py testapp.test_only_this" 1 'via run_tests API'
++django_test "$PYTHON testapp/runtests.py testapp.test_only_this" 1 'via run_tests API'
+
+ reset_env
+ export NOSE_PLUGINS="testapp.plugins.SanityCheckPlugin"
+-django_test "./manage.py test testapp/plugin_t $NOINPUT" 1 'with plugins'
++django_test "$PYTHON /usr/bin/django-admin test testapp/plugin_t $NOINPUT" 1 'with plugins'
+
+ reset_env
+-django_test "./manage.py test unittests $NOINPUT" 4 'unittests'
++django_test "$PYTHON /usr/bin/django-admin test unittests $NOINPUT" 4 'unittests'
+
+ reset_env
+-django_test "./manage.py test unittests --testrunner=testapp.custom_runner.CustomNoseTestSuiteRunner $NOINPUT" 4 'unittests with testrunner'
++django_test "$PYTHON /usr/bin/django-admin test unittests --testrunner=testapp.custom_runner.CustomNoseTestSuiteRunner $NOINPUT" 4 'unittests with testrunner'
+
+ reset_env
+ export REUSE_DB=1
+ # For the many issues with REUSE_DB=1, see:
+ # https://github.com/django-nose/django-nose/milestones/Fix%20REUSE_DB=1
+-django_test "./manage.py test $NOINPUT" $TESTAPP_COUNT 'with REUSE_DB=1, call #1' 'can fail'
+-django_test "./manage.py test $NOINPUT" $TESTAPP_COUNT 'with REUSE_DB=1, call #2' 'can fail'
++django_test "$PYTHON /usr/bin/django-admin test $NOINPUT" $TESTAPP_COUNT 'with REUSE_DB=1, call #1' 'can fail'
++django_test "$PYTHON /usr/bin/django-admin test $NOINPUT" $TESTAPP_COUNT 'with REUSE_DB=1, call #2' 'can fail'
+
+
+ if [ "$HAS_HOTSHOT" = "1" ]
+ then
+ # Python 3 doesn't support the hotshot profiler. See nose#842.
+ reset_env
+- django_test "./manage.py test $NOINPUT --with-profile --profile-restrict less_output" $TESTAPP_COUNT 'with profile plugin'
++ django_test "$PYTHON /usr/bin/django-admin test $NOINPUT --with-profile --profile-restrict less_output" $TESTAPP_COUNT 'with profile plugin'
+ fi
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-nose.git
More information about the Python-modules-commits
mailing list