Merge remote branch 'remotes/gremu/master'

CHANGES.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+0.2.5
+-----
+
+* Fixing issue with ``--generate-fk`` option in management command. Thanks
+  Mikko Hellsing for the `report and fix`_.
+
+.. _report and fix: http://github.com/gregmuellegger/django-autofixture/issues/issue/1/
+
 0.2.4
 -----
 

MANIFEST.in

@@ -1,4 +1,4 @@
 include CHANGES.rst
-include LICENSE
+include LICENSE.txt
 include MANIFEST.in
 include README.rst

docs/contribute.rst

@@ -1,16 +1,17 @@
 Contribute
 ==========
 
-If you want to use an isolated buildout environment while hacking on
+If you want to use an isolated environment while hacking on
 ``django-autofixture`` you can run the following commands from the project's
 root directory::
 
-    python bootstrap.py
-    bin/buildout
+    virtualenv . --no-site-packages
+    source bin/activate
+    pip install -r requirements.txt
 
 Please run now the tests that are shipped with ``autofixture`` to see if
-everything is well::
+everything is working::
 
-    bin/test
+    python runtests.py
 
 Happy hacking!

fabfile.py

@@ -3,14 +3,6 @@
 from fabric.api import abort, cd, local, env, run, settings, sudo
 
 
-#######################
-# Development helpers #
-#######################
-
-def devinit():
-    local('test -e bin/buildout || python bootstrap.py', capture=False)
-    local('bin/buildout', capture=False)
-
 #################
 # Documentation #
 #################

manage.py

@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+import os
+
+os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+
+
+if __name__ == '__main__':
+    from django.core.management import execute_from_command_line
+    execute_from_command_line()

requirements.txt

@@ -0,0 +1,2 @@
+django
+django-extensions

runtests.py

@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+import os, sys
+
+os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+parent = os.path.dirname(os.path.abspath(__file__))
+
+sys.path.insert(0, parent)
+
+from django.test.simple import run_tests
+
+
+def runtests():
+    failures = run_tests(
+        [
+            'autofixture',
+            'autofixture_tests',
+            'autofixture_test',
+            'generator_test',
+            'sample_app',
+        ],
+        verbosity=1, interactive=True)
+    sys.exit(failures)
+
+if __name__ == '__main__':
+    runtests()

autofixture_tests/settings.py → settings.py

@@ -37,7 +37,7 @@
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'media')
+MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'autofixture_tests', 'media')
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
@@ -69,7 +69,7 @@
 ROOT_URLCONF = 'autofixture_tests.urls'
 
 TEMPLATE_DIRS = (
-    os.path.join(PROJECT_ROOT, 'templates'),
+    os.path.join(PROJECT_ROOT, 'autofixture_tests', 'templates'),
 )
 
 INSTALLED_APPS = (
@@ -81,6 +81,7 @@
 
     'django_extensions',
 
+    'autofixture_tests',
     'autofixture_tests.sample_app',
     'autofixture_tests.autofixture_test',
     'autofixture_tests.generator_test',

setup.py

@@ -32,7 +32,7 @@ def split(self, *args, **kw):
 
 setup(
     name = 'django-autofixture',
-    version = '0.2.4',
+    version = '0.2.5',
     url = 'https://github.com/gregmuellegger/django-autofixture',
     license = 'BSD',
     description = 'Provides tools to auto generate test data.',
@@ -54,4 +54,5 @@ def split(self, *args, **kw):
         'autofixture.management',
         'autofixture.management.commands'],
     install_requires = ['setuptools'],
+    test_suite = 'runtests.runtests',
 )