[Python-modules-commits] [python-django] 01/04: Fix the DEP-8 test suite

[Raphaël Hertzog]

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

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

commit 90d7f9c7d1d575367e15ebc2f2a9c3ac4f1048ad
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Wed Apr 6 17:57:48 2016 +0200

    Fix the DEP-8 test suite
    
    django-admin --with python3 failing because ./manage.py does not have a good shebang
---
 debian/changelog          |  2 ++
 debian/tests/django-admin | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d280913..9458e84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ python-django (1.9.5-1) UNRELEASED; urgency=medium
 
   * New upstream bugfix release:
     https://docs.djangoproject.com/en/1.9/releases/1.9.5/
+  * Fix the DEP-8 test suite (django-admin --with python3 failing
+    because ./manage.py does not have a good shebang).
 
  -- Raphaël Hertzog <hertzog at debian.org>  Mon, 04 Apr 2016 15:40:24 +0200
 
diff --git a/debian/tests/django-admin b/debian/tests/django-admin
index d4b2dc6..e27bda1 100755
--- a/debian/tests/django-admin
+++ b/debian/tests/django-admin
@@ -31,4 +31,12 @@ run django-admin startapp testapp
 ensure_files_exist testapp/models.py testapp/tests.py testapp/views.py
 
 # Test manage.py
-./manage.py check
+#./manage.py check
+
+# Needed because upstream doesn't want to rewrite shebang of ./manage.py
+# see https://code.djangoproject.com/ticket/20027
+if [ -e /usr/bin/python ]; then
+    ./manage.py check
+else
+    python3 ./manage.py check
+fi

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