Replace fjord.sampledata with django-eadred

I spent some time extracting the sampledata application out as a separate project so we could use it in Kitsune (and other places as well). This switches fjord over to using that. One nice thing eadred has is the ability to pass parameters from the command line to the generate_sampledata functions. This allows us to easily allow for different kinds of sample data generation: reproducible data set for contributors, randomized large data set for testing the dashboard, icky data set for testing security and unicode handling, ...
mythmon · Sep 27, 2012 · 9f388a3 · 9f388a3
1 parent f803445
commit 9f388a3
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 39 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "vendor-local/src/jingo-minify"]
 	path = vendor-local/src/jingo-minify
 	url = git://github.com/jsocol/jingo-minify
+[submodule "vendor-local/src/django-eadred"]
+	path = vendor-local/src/django-eadred
+	url = git://github.com/willkg/django-eadred.git
diff --git a/docs/hacking_howto.rst b/docs/hacking_howto.rst
@@ -315,7 +315,7 @@ Getting sample data
 
 You can get sample data in your db by running::
 
-    $ ./manage.py sampledata
+    $ ./manage.py generatedata
 
 This will generate a bunch of sample data so that your Fjord instance
 has something to look at.

diff --git a/fjord/feedback/sampledata.py b/fjord/feedback/sampledata.py
@@ -25,7 +25,7 @@ def create_simple(happy, description, url=u'', ua=FIREFOX_LINUX_17,
     return obj
 
 
-def generate_sampledata():
+def generate_sampledata(options):
     # Create 5 happy opinions.
     create_simple(True, u'Firefox is great!')
     create_simple(True, u'Made me pancakes!')

diff --git a/fjord/sampledata/__init__.py b/fjord/sampledata/__init__.py
diff --git a/fjord/sampledata/management/__init__.py b/fjord/sampledata/management/__init__.py
diff --git a/fjord/sampledata/management/commands/__init__.py b/fjord/sampledata/management/commands/__init__.py
diff --git a/fjord/sampledata/management/commands/sampledata.py b/fjord/sampledata/management/commands/sampledata.py
diff --git a/fjord/settings/base.py b/fjord/settings/base.py
@@ -24,13 +24,13 @@
         'django.contrib.admin',
         'django_nose',
         'djcelery',
+        'eadred',
         'jingo_minify',
         'test_utils',
 
         'fjord.analytics',
         'fjord.base',
         'fjord.feedback',
-        'fjord.sampledata',
         'fjord.search',
     ))
 

diff --git a/vendor-local/src/django-eadred b/vendor-local/src/django-eadred
diff --git a/vendor-local/vendor.pth b/vendor-local/vendor.pth
@@ -1,8 +1,9 @@
-src/django-cache-machine
 src/django-adminplus
+src/django-cache-machine
+src/django-eadred
 src/elasticutils
 src/jingo-minify
 packages/pyes
-packages/python-memcached
 packages/pyquery
+packages/python-memcached
 packages/cssselect