Skip to content
This repository was archived by the owner on Apr 27, 2022. It is now read-only.

Commit 82ae6cc

Browse files
author
Piotr Duda
committed
Support for Django 1.9
1 parent 67aeb4a commit 82ae6cc

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
.pydevproject
44
dist
55
*.egg-info
6+
env/

fixture_generator/management/commands/generate_fixture.py

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import os
22
import sys
33
import logging
4+
import importlib
45
from optparse import make_option
56

67
from django.core.management import BaseCommand, call_command
78
from django.conf import settings
89

910
from fixture_generator.signals import data_dumped
10-
from django.test.simple import DjangoTestSuiteRunner
11+
from django.test.runner import DiscoverRunner
1112
from django.test.utils import get_runner
12-
from django.utils import importlib
1313

1414
import contextlib
1515
from fixture_generator.base import get_available_fixtures, calculate_requirements
@@ -38,16 +38,13 @@ def testing_environment():
3838
settings.CELERY_ALWAYS_EAGER = True
3939
settings.INDEXING_DISABLED = True
4040

41-
# make sure south doesn't break stuff
42-
management._commands['syncdb'] = 'django.core'
43-
4441
yield
4542

4643
activate(current_language)
4744
settings.EMAIL_BACKEND = original_email_backend
4845

4946

50-
class GeneratingSuiteRunner(DjangoTestSuiteRunner):
47+
class GeneratingSuiteRunner(DiscoverRunner):
5148

5249
def __init__(self, requirements, models, options):
5350
super(GeneratingSuiteRunner, self).__init__(verbosity=1)
@@ -68,8 +65,7 @@ def teardown_databases(self, old_config, **kwargs):
6865
"""
6966
Destroys all the non-mirror databases.
7067
"""
71-
old_names, mirrors = old_config
72-
for connection, old_name, destroy in old_names:
68+
for connection, old_name, destroy in old_config:
7369
if destroy:
7470
connection.creation.destroy_test_db(old_name, self.verbosity)
7571

runtests.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
from os.path import dirname, abspath
55
from django.conf import settings
6+
from django import setup
67

78
if not settings.configured:
89
settings.configure(
@@ -19,15 +20,15 @@
1920
]
2021
)
2122

22-
from django.test.simple import DjangoTestSuiteRunner
23-
23+
from django.test.runner import DiscoverRunner
2424

2525
def runtests(*test_args):
2626
if not test_args:
27-
test_args = ["tests"]
27+
test_args = ["fixture_generator.tests"]
2828
parent = dirname(abspath(__file__))
2929
sys.path.insert(0, parent)
30-
runner = DjangoTestSuiteRunner(verbosity=2, interactive=True, failfast=False)
30+
setup()
31+
runner = DiscoverRunner(verbosity=2, interactive=True, failfast=False)
3132
failures = runner.run_tests(test_args)
3233
sys.exit(failures)
3334

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
setup(
1010
name='djfixture',
11-
version="0.3.0a7",
11+
version="0.3.1",
1212
description='django-fixture-generator is a reusable django application to make writing fixtures not suck.',
1313
long_description=readme,
1414
author='Alex Gaynor',

0 commit comments

Comments
 (0)