aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Law <simon.law@ecometrica.com>2012-07-24 15:14:12 -0400
committerSimon Law <simon.law@ecometrica.com>2012-07-24 15:14:12 -0400
commitbde096a028c2705b8f56fb5fdcbbaed4b318862d (patch)
tree8b9245948d43bac6c1755b0739d13b579f7419e3
parent8e53c5bc5db462f6e39404c73ac96ec0cbb6a6c7 (diff)
downloaddjango-wkhtmltopdf-bde096a028c2705b8f56fb5fdcbbaed4b318862d.tar.gz
django-wkhtmltopdf-bde096a028c2705b8f56fb5fdcbbaed4b318862d.tar.bz2
django-wkhtmltopdf-bde096a028c2705b8f56fb5fdcbbaed4b318862d.zip
Move testproject to wkhtmltopdf._testproject.
Avoid polluting the global library namespace with testproject. Instead, since wkhtmltopdf tests use it, we install it within under a "private" name. --HG-- rename : testproject/__init__.py => wkhtmltopdf/_testproject/__init__.py rename : testproject/manage.py => wkhtmltopdf/_testproject/manage.py rename : testproject/requirements.txt => wkhtmltopdf/_testproject/requirements.txt rename : testproject/settings.py => wkhtmltopdf/_testproject/settings.py rename : testproject/templates/footer.html => wkhtmltopdf/_testproject/templates/footer.html rename : testproject/templates/sample.html => wkhtmltopdf/_testproject/templates/sample.html rename : testproject/urls.py => wkhtmltopdf/_testproject/urls.py
-rw-r--r--setup.py2
-rw-r--r--wkhtmltopdf/_testproject/__init__.py (renamed from testproject/__init__.py)0
-rw-r--r--wkhtmltopdf/_testproject/manage.py (renamed from testproject/manage.py)0
-rw-r--r--wkhtmltopdf/_testproject/requirements.txt (renamed from testproject/requirements.txt)0
-rw-r--r--wkhtmltopdf/_testproject/settings.py (renamed from testproject/settings.py)0
-rw-r--r--wkhtmltopdf/_testproject/templates/footer.html (renamed from testproject/templates/footer.html)0
-rw-r--r--wkhtmltopdf/_testproject/templates/sample.html (renamed from testproject/templates/sample.html)0
-rw-r--r--wkhtmltopdf/_testproject/urls.py (renamed from testproject/urls.py)0
-rw-r--r--wkhtmltopdf/tests.py4
9 files changed, 4 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 86c0b44..865b096 100644
--- a/setup.py
+++ b/setup.py
@@ -13,5 +13,7 @@ setup(
author=wkhtmltopdf.__author__,
author_email='admin@incuna.com',
url='http://incuna.com/',
+ install_requires=['Django>=1.3'],
+ zip_safe=False,
)
diff --git a/testproject/__init__.py b/wkhtmltopdf/_testproject/__init__.py
index e69de29..e69de29 100644
--- a/testproject/__init__.py
+++ b/wkhtmltopdf/_testproject/__init__.py
diff --git a/testproject/manage.py b/wkhtmltopdf/_testproject/manage.py
index 3e4eedc..3e4eedc 100644
--- a/testproject/manage.py
+++ b/wkhtmltopdf/_testproject/manage.py
diff --git a/testproject/requirements.txt b/wkhtmltopdf/_testproject/requirements.txt
index 74c18fb..74c18fb 100644
--- a/testproject/requirements.txt
+++ b/wkhtmltopdf/_testproject/requirements.txt
diff --git a/testproject/settings.py b/wkhtmltopdf/_testproject/settings.py
index 0454766..0454766 100644
--- a/testproject/settings.py
+++ b/wkhtmltopdf/_testproject/settings.py
diff --git a/testproject/templates/footer.html b/wkhtmltopdf/_testproject/templates/footer.html
index 3ae09cb..3ae09cb 100644
--- a/testproject/templates/footer.html
+++ b/wkhtmltopdf/_testproject/templates/footer.html
diff --git a/testproject/templates/sample.html b/wkhtmltopdf/_testproject/templates/sample.html
index 3dfbdbb..3dfbdbb 100644
--- a/testproject/templates/sample.html
+++ b/wkhtmltopdf/_testproject/templates/sample.html
diff --git a/testproject/urls.py b/wkhtmltopdf/_testproject/urls.py
index 039e61a..039e61a 100644
--- a/testproject/urls.py
+++ b/wkhtmltopdf/_testproject/urls.py
diff --git a/wkhtmltopdf/tests.py b/wkhtmltopdf/tests.py
index 0497dd3..19fde76 100644
--- a/wkhtmltopdf/tests.py
+++ b/wkhtmltopdf/tests.py
@@ -120,7 +120,7 @@ class TestViews(TestCase):
STATIC_URL='/static/',
TEMPLATE_LOADERS=['django.template.loaders.filesystem.Loader'],
TEMPLATE_DIRS=[os.path.join(os.path.dirname(__file__),
- 'testproject', 'templates')],
+ '_testproject', 'templates')],
WKHTMLTOPDF_DEBUG=False,
):
# Setup sample.html
@@ -186,7 +186,7 @@ class TestViews(TestCase):
STATIC_URL='/static/',
TEMPLATE_LOADERS=['django.template.loaders.filesystem.Loader'],
TEMPLATE_DIRS=[os.path.join(os.path.dirname(__file__),
- 'testproject', 'templates')],
+ '_testproject', 'templates')],
WKHTMLTOPDF_DEBUG=False,
):
# Setup sample.html