Commits

Matthew Schinckel committed 66364ad Merge

Merge back from tip.

  • Participants
  • Parent commits b1f6abe, 1af6bd4
  • Branches badges

Comments (0)

Files changed (5)

 044627baf57bb65fc3ec23fbc24611b7c772aba4 1.2
 44de6ad116258796889796b8175ca70d9f71b5b0 1.2.1
 73306590bdac02fd6c92ff7b38e172bf291e7df5 1.2.2
+3424a98213d8c09a8e35f4dd9e1a8a521aa812ad 1.2.3
+813d102e1296c08bd865f36cf00418eeeda16729 1.2.4
 jbergantine
 Bryan Koroleski
 Roman Prokofyev
-Randall Degges (http://rdegges.com/)
+Randall Degges (http://rdegges.com/)
+Matthew Schinckel
+Simon Charette

File django_coverage/__init__.py

 limitations under the License.
 """
 
-__version__ = '1.2.2'
+__version__ = '1.2.4'

File django_coverage/coverage_runner.py

 limitations under the License.
 
 """
-
 import os
 import sys
 
-try:
-    from django.test.simple import DjangoTestSuiteRunner
-except ImportError:
+import django
+
+if django.VERSION < (1, 2):
     msg = """
 
     django-coverage 1.1+ requires django 1.2+.
     """
     raise Exception(msg)
 
+from django.conf import global_settings
 from django.db.models import get_app, get_apps
 from django.test.utils import get_runner
 
 from django_coverage.utils.module_tools import get_all_modules
 
 
+DjangoTestSuiteRunner = get_runner(global_settings)
+
+
 class CoverageRunner(DjangoTestSuiteRunner):
     """
     Test runner which displays a code coverage report at the end of the run.
       author_email='george@55minutes.com',
       maintainer = 'Mikhail Korobov',
       maintainer_email = 'kmike84@gmail.com',
-      url = 'http://bitbucket.org/kmike/django-coverage/',
-      download_url = 'http://bitbucket.org/kmike/django-coverage/get/%s.zip' % __version__,
+      url = 'https://bitbucket.org/kmike/django-coverage/',
 
       description = 'Django Test Coverage App',
       long_description = "A test coverage reporting tool that utilizes "