Move tests location

.travis.yml

@@ -6,7 +6,7 @@ install:
     - pip install nose unittest2 mock --use-mirrors
     - pip install . --use-mirrors
     - pip install Markdown
-script: nosetests -s tests
+script: nosetests -s pelican
 notifications:
     irc:
         channels: 

MANIFEST.in

@@ -2,5 +2,6 @@ include *.rst
 global-include *.py
 recursive-include pelican *.html *.css *png *.in
 include LICENSE THANKS
-recursive-include tests *
-recursive-exclude tests *.pyc
+recursive-include pelican/tests *
+recursive-exclude pelican/tests *.pyc
+recursive-include samples *

tests/test_pelican.py → pelican/tests/test_pelican.py

@@ -15,7 +15,8 @@
 from pelican.settings import read_settings
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
-SAMPLES_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "..", "samples")))
+SAMPLES_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "..", "..",
+                                            "samples")))
 OUTPUT_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "output")))
 
 INPUT_PATH = os.path.join(SAMPLES_PATH, "content")

setup.py

@@ -41,5 +41,5 @@
          'Topic :: Internet :: WWW/HTTP',
          'Topic :: Software Development :: Libraries :: Python Modules',
     ],
-    test_suite='tests',
+    test_suite='pelican.tests',
 )

tox.ini

@@ -2,7 +2,7 @@
 envlist = py26,py27
 
 [testenv]
-commands = nosetests -s tests
+commands = nosetests -s pelican
 deps =
     nose
     Jinja2