diff --git a/.gitignore b/.gitignore index a74b885..c196958 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,14 @@ +# basic python ignores *.pyc + +# build/dist ignores dist/* *.egg-info/* *.egg* +build/* + +# ignore virtualenv directory env/* + +# ignore db created in test app +db diff --git a/setup.py b/setup.py index ae90c6e..ab51faf 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,5 @@ from setuptools import setup, find_packages - setup( name='django-queryset-csv', version='0.1.1', diff --git a/test_app/djqscsv_tests/tests.py b/test_app/djqscsv_tests/tests.py index 0a01759..6e65d38 100644 --- a/test_app/djqscsv_tests/tests.py +++ b/test_app/djqscsv_tests/tests.py @@ -9,6 +9,8 @@ from .models import Person +from .util import create_people_and_get_queryset + import six if six.PY3: @@ -18,14 +20,6 @@ from StringIO import StringIO -def create_people_and_get_queryset(): - Person.objects.create(name='vetch', address='iffish', info='wizard') - Person.objects.create(name='nemmerle', address='roke', - info='arch mage') - - return Person.objects.all() - - class ValidateCleanFilenameTests(TestCase): def assertValidatedEquals(self, filename, expected_value): diff --git a/test_app/djqscsv_tests/urls.py b/test_app/djqscsv_tests/urls.py new file mode 100644 index 0000000..84d3193 --- /dev/null +++ b/test_app/djqscsv_tests/urls.py @@ -0,0 +1,7 @@ +from django.conf.urls import patterns, include, url +import views + +urlpatterns = patterns( + '', + url(r'^get_csv/', views.get_csv, name='get_csv'), +) diff --git a/test_app/djqscsv_tests/util.py b/test_app/djqscsv_tests/util.py new file mode 100644 index 0000000..b68cf82 --- /dev/null +++ b/test_app/djqscsv_tests/util.py @@ -0,0 +1,9 @@ +from .models import Person + +def create_people_and_get_queryset(): + Person.objects.create(name='vetch', address='iffish', info='wizard') + Person.objects.create(name='nemmerle', address='roke', + info='arch mage') + + return Person.objects.all() + diff --git a/test_app/djqscsv_tests/views.py b/test_app/djqscsv_tests/views.py new file mode 100644 index 0000000..16d2be1 --- /dev/null +++ b/test_app/djqscsv_tests/views.py @@ -0,0 +1,9 @@ + +import djqscsv +from models import Person +from .util import create_people_and_get_queryset + + +def get_csv(request): + qs = create_people_and_get_queryset() + return djqscsv.render_to_csv_response(qs) diff --git a/test_app/test_app/settings.py b/test_app/test_app/settings.py index b5cb624..b5ab87f 100644 --- a/test_app/test_app/settings.py +++ b/test_app/test_app/settings.py @@ -9,3 +9,7 @@ SECRET_KEY = 'NO_SECRET_KEY' INSTALLED_APPS = ('djqscsv_tests',) + +ROOT_URLCONF = 'djqscsv_tests.urls' + +DEBUG = True