aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Tamlyn <marc.tamlyn@gmail.com>2012-07-27 14:59:43 +0100
committerMarc Tamlyn <marc.tamlyn@gmail.com>2012-07-27 14:59:43 +0100
commit1ef1a0bc443f1d8bbc8bddcda3562550a5b63119 (patch)
tree75aedd09597082628e86add980e0b17917696688
parentd236427edccbd2fcb5dac438845d7de48ed2398d (diff)
downloaddjango-wkhtmltopdf-1ef1a0bc443f1d8bbc8bddcda3562550a5b63119.tar.gz
django-wkhtmltopdf-1ef1a0bc443f1d8bbc8bddcda3562550a5b63119.tar.bz2
django-wkhtmltopdf-1ef1a0bc443f1d8bbc8bddcda3562550a5b63119.zip
Move the testproject out of the main folder.
Also exclude it from distributions using the MANIFEST.
-rw-r--r--MANIFEST.in2
-rw-r--r--Makefile2
-rw-r--r--testproject/__init__.py (renamed from wkhtmltopdf/_testproject/__init__.py)0
-rw-r--r--testproject/manage.py (renamed from wkhtmltopdf/_testproject/manage.py)0
-rw-r--r--testproject/requirements.txt (renamed from wkhtmltopdf/_testproject/requirements.txt)0
-rw-r--r--testproject/settings.py (renamed from wkhtmltopdf/_testproject/settings.py)1
-rw-r--r--testproject/templates/footer.html (renamed from wkhtmltopdf/_testproject/templates/footer.html)0
-rw-r--r--testproject/templates/sample.html (renamed from wkhtmltopdf/_testproject/templates/sample.html)0
-rw-r--r--testproject/urls.py (renamed from wkhtmltopdf/_testproject/urls.py)0
9 files changed, 3 insertions, 2 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 05c4bc6..234eb1f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
include README.rst
recursive-include * *.html
-
+recursive-exclude testproject *
diff --git a/Makefile b/Makefile
index b15be42..08f30ec 100644
--- a/Makefile
+++ b/Makefile
@@ -4,4 +4,4 @@ release:
python setup.py register sdist upload
test:
- python wkhtmltopdf/_testproject/manage.py test wkhtmltopdf
+ python testproject/manage.py test wkhtmltopdf
diff --git a/wkhtmltopdf/_testproject/__init__.py b/testproject/__init__.py
index e69de29..e69de29 100644
--- a/wkhtmltopdf/_testproject/__init__.py
+++ b/testproject/__init__.py
diff --git a/wkhtmltopdf/_testproject/manage.py b/testproject/manage.py
index 3e4eedc..3e4eedc 100644
--- a/wkhtmltopdf/_testproject/manage.py
+++ b/testproject/manage.py
diff --git a/wkhtmltopdf/_testproject/requirements.txt b/testproject/requirements.txt
index 74c18fb..74c18fb 100644
--- a/wkhtmltopdf/_testproject/requirements.txt
+++ b/testproject/requirements.txt
diff --git a/wkhtmltopdf/_testproject/settings.py b/testproject/settings.py
index 0454766..33674d4 100644
--- a/wkhtmltopdf/_testproject/settings.py
+++ b/testproject/settings.py
@@ -125,6 +125,7 @@ INSTALLED_APPS = (
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
+ 'testproject',
'wkhtmltopdf',
)
diff --git a/wkhtmltopdf/_testproject/templates/footer.html b/testproject/templates/footer.html
index 3ae09cb..3ae09cb 100644
--- a/wkhtmltopdf/_testproject/templates/footer.html
+++ b/testproject/templates/footer.html
diff --git a/wkhtmltopdf/_testproject/templates/sample.html b/testproject/templates/sample.html
index 3dfbdbb..3dfbdbb 100644
--- a/wkhtmltopdf/_testproject/templates/sample.html
+++ b/testproject/templates/sample.html
diff --git a/wkhtmltopdf/_testproject/urls.py b/testproject/urls.py
index 039e61a..039e61a 100644
--- a/wkhtmltopdf/_testproject/urls.py
+++ b/testproject/urls.py