[Python-modules-commits] r25945 - in packages/django-markupfield/trunk/debian (2 files)

[fladi-guest at users.alioth.debian.org]

    Date: Tuesday, September 24, 2013 @ 12:20:56
  Author: fladi-guest
Revision: 25945

Drop our own version of settings.py and use the one supplied by upstream for running unit tests.

Modified:
  packages/django-markupfield/trunk/debian/rules
Deleted:
  packages/django-markupfield/trunk/debian/settings.py

Modified: packages/django-markupfield/trunk/debian/rules
===================================================================
--- packages/django-markupfield/trunk/debian/rules	2013-09-24 11:59:11 UTC (rev 25944)
+++ packages/django-markupfield/trunk/debian/rules	2013-09-24 12:20:56 UTC (rev 25945)
@@ -5,15 +5,8 @@
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	django-admin startproject testproject
-	if [ -d testproject/testproject ]; then \
-		cp debian/settings.py testproject/testproject ; \
-	else \
-		cp debian/settings.py testproject ; \
-	fi
 	set -e; \
 	for python in $(shell pyversions -r); do \
-		PYTHONPATH=".:testproject" $$python testproject/manage.py test --settings=testproject.settings ; \
+		$$python $$(which django-admin) test --settings=markupfield.tests.settings --pythonpath=. ; \
 	done
-	rm -rf testproject
 endif

Deleted: packages/django-markupfield/trunk/debian/settings.py
===================================================================
--- packages/django-markupfield/trunk/debian/settings.py	2013-09-24 11:59:11 UTC (rev 25944)
+++ packages/django-markupfield/trunk/debian/settings.py	2013-09-24 12:20:56 UTC (rev 25945)
@@ -1,24 +0,0 @@
-import markdown
-from docutils.core import publish_parts
-
-def render_rest(markup):
-    parts = publish_parts(source=markup, writer_name="html4css1")
-    return parts["fragment"]
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'testproject/test.db3',
-    }
-}
-
-MARKUP_FIELD_TYPES = [
-    ('markdown', markdown.markdown),
-    ('ReST', render_rest),
-]
-
-INSTALLED_APPS = (
-    'markupfield.tests',
-)
-
-SECRET_KEY = 'testkey'