[Python-modules-commits] [django-nose] 04/14: merge patched into master
Thomas Goirand
zigo at moszumanska.debian.org
Tue Jul 19 12:24:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
zigo pushed a commit to branch master
in repository django-nose.
commit dabc0d246e58b8c9cd650e9a10c96c51f9f9ce5d
Merge: 9d0f173 e7b67fe
Author: Thomas Goirand <thomas at goirand.fr>
Date: Tue Jul 19 11:50:26 2016 +0000
merge patched into master
debian/.git-dpm | 4 +--
...nnecessary-dependency-on-dj_database_url.patch} | 2 +-
...s-that-use-REUSE_DB-as-they-are-currentl.patch} | 2 +-
debian/patches/django17.patch | 32 ----------------------
debian/patches/runtests.patch | 2 +-
debian/patches/series | 5 ++--
testapp/runtests.py | 2 --
7 files changed, 7 insertions(+), 42 deletions(-)
diff --cc debian/.git-dpm
index e4849eb,0000000..41fabe0
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
- 88a35ce342a64286a8ddf13ae428b2a4e9c5be67
- 88a35ce342a64286a8ddf13ae428b2a4e9c5be67
++e7b67fe9cee8bf59b4f2f183a4427411860dc297
++e7b67fe9cee8bf59b4f2f183a4427411860dc297
+d418be775674518b1226ef5039f7f36ec4b8d84d
+d418be775674518b1226ef5039f7f36ec4b8d84d
+django-nose_1.4.3.orig.tar.gz
+2aaf28915cac4d52b8c1ceb586f3b7a09e278480
+42647
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Remove-unnecessary-dependency-on-dj_database_url.patch
index bdb3b84,0000000..f5c9b91
mode 100644,000000..100644
--- a/debian/patches/0002-Remove-unnecessary-dependency-on-dj_database_url.patch
+++ b/debian/patches/0002-Remove-unnecessary-dependency-on-dj_database_url.patch
@@@ -1,39 -1,0 +1,39 @@@
- From a0f484fe26b8df32f8a5b26a961dcc88340b1cd5 Mon Sep 17 00:00:00 2001
++From 07e8b26f318a2ac5c5c27473f48eb12cb02a08ce 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/0003-Disable-tests-that-use-REUSE_DB-as-they-are-currentl.patch
index 45778a3,0000000..a6d53a0
mode 100644,000000..100644
--- a/debian/patches/0003-Disable-tests-that-use-REUSE_DB-as-they-are-currentl.patch
+++ b/debian/patches/0003-Disable-tests-that-use-REUSE_DB-as-they-are-currentl.patch
@@@ -1,31 -1,0 +1,31 @@@
- From 88a35ce342a64286a8ddf13ae428b2a4e9c5be67 Mon Sep 17 00:00:00 2001
++From e7b67fe9cee8bf59b4f2f183a4427411860dc297 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Thu, 7 Jan 2016 13:02:24 +0100
+Subject: Disable tests that use REUSE_DB as they are currently broken.
+
+Bug-Vendor: https://github.com/django-nose/django-nose/milestones/Fix%20REUSE_DB=1
+---
+ runtests.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/runtests.sh b/runtests.sh
+index e66c055..0b680b7 100755
+--- a/runtests.sh
++++ b/runtests.sh
+@@ -185,12 +185,12 @@ django_test "$PYTHON /usr/bin/django-admin test unittests --testrunner=testapp.c
+ reset_env
+ django_test "$PYTHON /usr/bin/django-admin test unittests --attr special $NOINPUT" 1 'select by attribute'
+
+-reset_env
+-export REUSE_DB=1
++#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 "$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'
++#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" ]
diff --cc debian/patches/runtests.patch
index 32087ee,0000000..6fe7b64
mode 100644,000000..100644
--- a/debian/patches/runtests.patch
+++ b/debian/patches/runtests.patch
@@@ -1,101 -1,0 +1,101 @@@
- From 7103f0c63468ba6d1c93202613c812a68ad72994 Mon Sep 17 00:00:00 2001
++From 6b418d0eddca24bb7491ef7fcacdf6887759ddc6 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 | 33 +++++++++++++++++++--------------
+ 1 file changed, 19 insertions(+), 14 deletions(-)
+
+diff --git a/runtests.sh b/runtests.sh
+index f825e3a..e66c055 100755
+--- a/runtests.sh
++++ b/runtests.sh
+@@ -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 "\
+ try:
+ import hotshot
+ except ImportError:
+@@ -147,50 +152,50 @@ 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 --verbosity 1 $NOINPUT" 4 'argument option without equals'
++django_test "$PYTHON /usr/bin/django-admin test unittests --verbosity 1 $NOINPUT" 4 'argument option without equals'
+
+ 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
+-django_test "./manage.py test unittests --attr special $NOINPUT" 1 'select by attribute'
++django_test "$PYTHON /usr/bin/django-admin test unittests --attr special $NOINPUT" 1 'select by attribute'
+
+ 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
diff --cc debian/patches/series
index 737185b,0000000..33bfcfb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,3 @@@
- django17.patch
+runtests.patch
- 0003-Remove-unnecessary-dependency-on-dj_database_url.patch
- 0004-Disable-tests-that-use-REUSE_DB-as-they-are-currentl.patch
++0002-Remove-unnecessary-dependency-on-dj_database_url.patch
++0003-Disable-tests-that-use-REUSE_DB-as-they-are-currentl.patch
--
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