diff --git a/.travis.yml b/.travis.yml index ea134da41..e7831e13b 100644 --- a/.travis.yml +++ b/.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: diff --git a/MANIFEST.in b/MANIFEST.in index bec6d1a39..e470abaa4 100644 --- a/MANIFEST.in +++ b/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 * diff --git a/tests/TestPages/bad_page.rst b/pelican/tests/TestPages/bad_page.rst similarity index 100% rename from tests/TestPages/bad_page.rst rename to pelican/tests/TestPages/bad_page.rst diff --git a/tests/TestPages/hidden_page.rst b/pelican/tests/TestPages/hidden_page.rst similarity index 100% rename from tests/TestPages/hidden_page.rst rename to pelican/tests/TestPages/hidden_page.rst diff --git a/tests/TestPages/hidden_page_markdown.md b/pelican/tests/TestPages/hidden_page_markdown.md similarity index 100% rename from tests/TestPages/hidden_page_markdown.md rename to pelican/tests/TestPages/hidden_page_markdown.md diff --git a/tests/TestPages/hidden_page_with_template.rst b/pelican/tests/TestPages/hidden_page_with_template.rst similarity index 100% rename from tests/TestPages/hidden_page_with_template.rst rename to pelican/tests/TestPages/hidden_page_with_template.rst diff --git a/tests/TestPages/page.rst b/pelican/tests/TestPages/page.rst similarity index 100% rename from tests/TestPages/page.rst rename to pelican/tests/TestPages/page.rst diff --git a/tests/TestPages/page_markdown.md b/pelican/tests/TestPages/page_markdown.md similarity index 100% rename from tests/TestPages/page_markdown.md rename to pelican/tests/TestPages/page_markdown.md diff --git a/tests/TestPages/page_with_template.rst b/pelican/tests/TestPages/page_with_template.rst similarity index 100% rename from tests/TestPages/page_with_template.rst rename to pelican/tests/TestPages/page_with_template.rst diff --git a/tests/__init__.py b/pelican/tests/__init__.py similarity index 100% rename from tests/__init__.py rename to pelican/tests/__init__.py diff --git a/tests/content/TestCategory/article_with_category.rst b/pelican/tests/content/TestCategory/article_with_category.rst similarity index 100% rename from tests/content/TestCategory/article_with_category.rst rename to pelican/tests/content/TestCategory/article_with_category.rst diff --git a/tests/content/TestCategory/article_without_category.rst b/pelican/tests/content/TestCategory/article_without_category.rst similarity index 100% rename from tests/content/TestCategory/article_without_category.rst rename to pelican/tests/content/TestCategory/article_without_category.rst diff --git a/tests/content/article.rst b/pelican/tests/content/article.rst similarity index 100% rename from tests/content/article.rst rename to pelican/tests/content/article.rst diff --git a/tests/content/article_with_md_extension.md b/pelican/tests/content/article_with_md_extension.md similarity index 100% rename from tests/content/article_with_md_extension.md rename to pelican/tests/content/article_with_md_extension.md diff --git a/tests/content/article_with_metadata.rst b/pelican/tests/content/article_with_metadata.rst similarity index 100% rename from tests/content/article_with_metadata.rst rename to pelican/tests/content/article_with_metadata.rst diff --git a/tests/content/article_with_mkd_extension.mkd b/pelican/tests/content/article_with_mkd_extension.mkd similarity index 100% rename from tests/content/article_with_mkd_extension.mkd rename to pelican/tests/content/article_with_mkd_extension.mkd diff --git a/tests/content/article_with_template.rst b/pelican/tests/content/article_with_template.rst similarity index 100% rename from tests/content/article_with_template.rst rename to pelican/tests/content/article_with_template.rst diff --git a/tests/content/article_with_uppercase_metadata.rst b/pelican/tests/content/article_with_uppercase_metadata.rst similarity index 100% rename from tests/content/article_with_uppercase_metadata.rst rename to pelican/tests/content/article_with_uppercase_metadata.rst diff --git a/tests/content/article_without_category.rst b/pelican/tests/content/article_without_category.rst similarity index 100% rename from tests/content/article_without_category.rst rename to pelican/tests/content/article_without_category.rst diff --git a/tests/content/wordpressexport.xml b/pelican/tests/content/wordpressexport.xml similarity index 100% rename from tests/content/wordpressexport.xml rename to pelican/tests/content/wordpressexport.xml diff --git a/tests/default_conf.py b/pelican/tests/default_conf.py similarity index 100% rename from tests/default_conf.py rename to pelican/tests/default_conf.py diff --git a/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html similarity index 100% rename from tests/output/basic/a-markdown-powered-article.html rename to pelican/tests/output/basic/a-markdown-powered-article.html diff --git a/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html similarity index 100% rename from tests/output/basic/archives.html rename to pelican/tests/output/basic/archives.html diff --git a/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html similarity index 100% rename from tests/output/basic/article-1.html rename to pelican/tests/output/basic/article-1.html diff --git a/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html similarity index 100% rename from tests/output/basic/article-2.html rename to pelican/tests/output/basic/article-2.html diff --git a/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html similarity index 100% rename from tests/output/basic/article-3.html rename to pelican/tests/output/basic/article-3.html diff --git a/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html similarity index 100% rename from tests/output/basic/author/alexis-metaireau.html rename to pelican/tests/output/basic/author/alexis-metaireau.html diff --git a/tests/output/basic/author/dummy-author.html b/pelican/tests/output/basic/author/dummy-author.html similarity index 100% rename from tests/output/basic/author/dummy-author.html rename to pelican/tests/output/basic/author/dummy-author.html diff --git a/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html similarity index 100% rename from tests/output/basic/categories.html rename to pelican/tests/output/basic/categories.html diff --git a/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html similarity index 100% rename from tests/output/basic/category/bar.html rename to pelican/tests/output/basic/category/bar.html diff --git a/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html similarity index 100% rename from tests/output/basic/category/cat1.html rename to pelican/tests/output/basic/category/cat1.html diff --git a/tests/output/basic/category/content.html b/pelican/tests/output/basic/category/content.html similarity index 100% rename from tests/output/basic/category/content.html rename to pelican/tests/output/basic/category/content.html diff --git a/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html similarity index 100% rename from tests/output/basic/category/misc.html rename to pelican/tests/output/basic/category/misc.html diff --git a/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html similarity index 100% rename from tests/output/basic/category/yeah.html rename to pelican/tests/output/basic/category/yeah.html diff --git a/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html similarity index 100% rename from tests/output/basic/drafts/a-draft-article.html rename to pelican/tests/output/basic/drafts/a-draft-article.html diff --git a/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml similarity index 100% rename from tests/output/basic/feeds/all-en.atom.xml rename to pelican/tests/output/basic/feeds/all-en.atom.xml diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml similarity index 100% rename from tests/output/basic/feeds/all-fr.atom.xml rename to pelican/tests/output/basic/feeds/all-fr.atom.xml diff --git a/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml similarity index 100% rename from tests/output/basic/feeds/all.atom.xml rename to pelican/tests/output/basic/feeds/all.atom.xml diff --git a/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml similarity index 100% rename from tests/output/basic/feeds/bar.atom.xml rename to pelican/tests/output/basic/feeds/bar.atom.xml diff --git a/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml similarity index 100% rename from tests/output/basic/feeds/cat1.atom.xml rename to pelican/tests/output/basic/feeds/cat1.atom.xml diff --git a/tests/output/basic/feeds/content.atom.xml b/pelican/tests/output/basic/feeds/content.atom.xml similarity index 100% rename from tests/output/basic/feeds/content.atom.xml rename to pelican/tests/output/basic/feeds/content.atom.xml diff --git a/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml similarity index 100% rename from tests/output/basic/feeds/misc.atom.xml rename to pelican/tests/output/basic/feeds/misc.atom.xml diff --git a/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml similarity index 100% rename from tests/output/basic/feeds/yeah.atom.xml rename to pelican/tests/output/basic/feeds/yeah.atom.xml diff --git a/tests/output/basic/index.html b/pelican/tests/output/basic/index.html similarity index 100% rename from tests/output/basic/index.html rename to pelican/tests/output/basic/index.html diff --git a/tests/output/basic/oh-yeah-fr.html b/pelican/tests/output/basic/oh-yeah-fr.html similarity index 100% rename from tests/output/basic/oh-yeah-fr.html rename to pelican/tests/output/basic/oh-yeah-fr.html diff --git a/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html similarity index 100% rename from tests/output/basic/oh-yeah.html rename to pelican/tests/output/basic/oh-yeah.html diff --git a/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html similarity index 100% rename from tests/output/basic/pages/this-is-a-test-hidden-page.html rename to pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html similarity index 100% rename from tests/output/basic/pages/this-is-a-test-page.html rename to pelican/tests/output/basic/pages/this-is-a-test-page.html diff --git a/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html similarity index 100% rename from tests/output/basic/second-article-fr.html rename to pelican/tests/output/basic/second-article-fr.html diff --git a/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html similarity index 100% rename from tests/output/basic/second-article.html rename to pelican/tests/output/basic/second-article.html diff --git a/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html similarity index 100% rename from tests/output/basic/tag/bar.html rename to pelican/tests/output/basic/tag/bar.html diff --git a/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html similarity index 100% rename from tests/output/basic/tag/baz.html rename to pelican/tests/output/basic/tag/baz.html diff --git a/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html similarity index 100% rename from tests/output/basic/tag/foo.html rename to pelican/tests/output/basic/tag/foo.html diff --git a/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html similarity index 100% rename from tests/output/basic/tag/foobar.html rename to pelican/tests/output/basic/tag/foobar.html diff --git a/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html similarity index 100% rename from tests/output/basic/tag/oh.html rename to pelican/tests/output/basic/tag/oh.html diff --git a/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html similarity index 100% rename from tests/output/basic/tag/yeah.html rename to pelican/tests/output/basic/tag/yeah.html diff --git a/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html similarity index 100% rename from tests/output/basic/tags.html rename to pelican/tests/output/basic/tags.html diff --git a/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css similarity index 100% rename from tests/output/basic/theme/css/main.css rename to pelican/tests/output/basic/theme/css/main.css diff --git a/tests/output/basic/theme/css/pygment.css b/pelican/tests/output/basic/theme/css/pygment.css similarity index 100% rename from tests/output/basic/theme/css/pygment.css rename to pelican/tests/output/basic/theme/css/pygment.css diff --git a/tests/output/basic/theme/css/reset.css b/pelican/tests/output/basic/theme/css/reset.css similarity index 100% rename from tests/output/basic/theme/css/reset.css rename to pelican/tests/output/basic/theme/css/reset.css diff --git a/tests/output/basic/theme/css/typogrify.css b/pelican/tests/output/basic/theme/css/typogrify.css similarity index 100% rename from tests/output/basic/theme/css/typogrify.css rename to pelican/tests/output/basic/theme/css/typogrify.css diff --git a/tests/output/basic/theme/css/wide.css b/pelican/tests/output/basic/theme/css/wide.css similarity index 100% rename from tests/output/basic/theme/css/wide.css rename to pelican/tests/output/basic/theme/css/wide.css diff --git a/tests/output/basic/theme/images/icons/delicious.png b/pelican/tests/output/basic/theme/images/icons/delicious.png similarity index 100% rename from tests/output/basic/theme/images/icons/delicious.png rename to pelican/tests/output/basic/theme/images/icons/delicious.png diff --git a/tests/output/basic/theme/images/icons/facebook.png b/pelican/tests/output/basic/theme/images/icons/facebook.png similarity index 100% rename from tests/output/basic/theme/images/icons/facebook.png rename to pelican/tests/output/basic/theme/images/icons/facebook.png diff --git a/tests/output/basic/theme/images/icons/gitorious.png b/pelican/tests/output/basic/theme/images/icons/gitorious.png similarity index 100% rename from tests/output/basic/theme/images/icons/gitorious.png rename to pelican/tests/output/basic/theme/images/icons/gitorious.png diff --git a/tests/output/basic/theme/images/icons/lastfm.png b/pelican/tests/output/basic/theme/images/icons/lastfm.png similarity index 100% rename from tests/output/basic/theme/images/icons/lastfm.png rename to pelican/tests/output/basic/theme/images/icons/lastfm.png diff --git a/tests/output/basic/theme/images/icons/linkedin.png b/pelican/tests/output/basic/theme/images/icons/linkedin.png similarity index 100% rename from tests/output/basic/theme/images/icons/linkedin.png rename to pelican/tests/output/basic/theme/images/icons/linkedin.png diff --git a/tests/output/basic/theme/images/icons/rss.png b/pelican/tests/output/basic/theme/images/icons/rss.png similarity index 100% rename from tests/output/basic/theme/images/icons/rss.png rename to pelican/tests/output/basic/theme/images/icons/rss.png diff --git a/tests/output/basic/theme/images/icons/twitter.png b/pelican/tests/output/basic/theme/images/icons/twitter.png similarity index 100% rename from tests/output/basic/theme/images/icons/twitter.png rename to pelican/tests/output/basic/theme/images/icons/twitter.png diff --git a/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html similarity index 100% rename from tests/output/basic/this-is-a-super-article.html rename to pelican/tests/output/basic/this-is-a-super-article.html diff --git a/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html similarity index 100% rename from tests/output/basic/unbelievable.html rename to pelican/tests/output/basic/unbelievable.html diff --git a/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html similarity index 100% rename from tests/output/custom/a-markdown-powered-article.html rename to pelican/tests/output/custom/a-markdown-powered-article.html diff --git a/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html similarity index 100% rename from tests/output/custom/archives.html rename to pelican/tests/output/custom/archives.html diff --git a/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html similarity index 100% rename from tests/output/custom/article-1.html rename to pelican/tests/output/custom/article-1.html diff --git a/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html similarity index 100% rename from tests/output/custom/article-2.html rename to pelican/tests/output/custom/article-2.html diff --git a/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html similarity index 100% rename from tests/output/custom/article-3.html rename to pelican/tests/output/custom/article-3.html diff --git a/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html similarity index 100% rename from tests/output/custom/author/alexis-metaireau.html rename to pelican/tests/output/custom/author/alexis-metaireau.html diff --git a/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html similarity index 100% rename from tests/output/custom/author/alexis-metaireau2.html rename to pelican/tests/output/custom/author/alexis-metaireau2.html diff --git a/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html similarity index 100% rename from tests/output/custom/categories.html rename to pelican/tests/output/custom/categories.html diff --git a/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html similarity index 100% rename from tests/output/custom/category/bar.html rename to pelican/tests/output/custom/category/bar.html diff --git a/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html similarity index 100% rename from tests/output/custom/category/cat1.html rename to pelican/tests/output/custom/category/cat1.html diff --git a/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html similarity index 100% rename from tests/output/custom/category/misc.html rename to pelican/tests/output/custom/category/misc.html diff --git a/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html similarity index 100% rename from tests/output/custom/category/yeah.html rename to pelican/tests/output/custom/category/yeah.html diff --git a/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html similarity index 100% rename from tests/output/custom/drafts/a-draft-article.html rename to pelican/tests/output/custom/drafts/a-draft-article.html diff --git a/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml similarity index 100% rename from tests/output/custom/feeds/all-en.atom.xml rename to pelican/tests/output/custom/feeds/all-en.atom.xml diff --git a/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml similarity index 100% rename from tests/output/custom/feeds/all-fr.atom.xml rename to pelican/tests/output/custom/feeds/all-fr.atom.xml diff --git a/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml similarity index 100% rename from tests/output/custom/feeds/all.atom.xml rename to pelican/tests/output/custom/feeds/all.atom.xml diff --git a/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml similarity index 100% rename from tests/output/custom/feeds/all.rss.xml rename to pelican/tests/output/custom/feeds/all.rss.xml diff --git a/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml similarity index 100% rename from tests/output/custom/feeds/bar.atom.xml rename to pelican/tests/output/custom/feeds/bar.atom.xml diff --git a/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml similarity index 100% rename from tests/output/custom/feeds/bar.rss.xml rename to pelican/tests/output/custom/feeds/bar.rss.xml diff --git a/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml similarity index 100% rename from tests/output/custom/feeds/cat1.atom.xml rename to pelican/tests/output/custom/feeds/cat1.atom.xml diff --git a/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml similarity index 100% rename from tests/output/custom/feeds/cat1.rss.xml rename to pelican/tests/output/custom/feeds/cat1.rss.xml diff --git a/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml similarity index 100% rename from tests/output/custom/feeds/misc.atom.xml rename to pelican/tests/output/custom/feeds/misc.atom.xml diff --git a/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml similarity index 100% rename from tests/output/custom/feeds/misc.rss.xml rename to pelican/tests/output/custom/feeds/misc.rss.xml diff --git a/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml similarity index 100% rename from tests/output/custom/feeds/yeah.atom.xml rename to pelican/tests/output/custom/feeds/yeah.atom.xml diff --git a/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml similarity index 100% rename from tests/output/custom/feeds/yeah.rss.xml rename to pelican/tests/output/custom/feeds/yeah.rss.xml diff --git a/tests/output/custom/index.html b/pelican/tests/output/custom/index.html similarity index 100% rename from tests/output/custom/index.html rename to pelican/tests/output/custom/index.html diff --git a/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html similarity index 100% rename from tests/output/custom/index2.html rename to pelican/tests/output/custom/index2.html diff --git a/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html similarity index 100% rename from tests/output/custom/oh-yeah-fr.html rename to pelican/tests/output/custom/oh-yeah-fr.html diff --git a/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html similarity index 100% rename from tests/output/custom/oh-yeah.html rename to pelican/tests/output/custom/oh-yeah.html diff --git a/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html similarity index 100% rename from tests/output/custom/pages/this-is-a-test-hidden-page.html rename to pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html similarity index 100% rename from tests/output/custom/pages/this-is-a-test-page.html rename to pelican/tests/output/custom/pages/this-is-a-test-page.html diff --git a/tests/output/custom/robots.txt b/pelican/tests/output/custom/robots.txt similarity index 100% rename from tests/output/custom/robots.txt rename to pelican/tests/output/custom/robots.txt diff --git a/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html similarity index 100% rename from tests/output/custom/second-article-fr.html rename to pelican/tests/output/custom/second-article-fr.html diff --git a/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html similarity index 100% rename from tests/output/custom/second-article.html rename to pelican/tests/output/custom/second-article.html diff --git a/tests/output/custom/static/pictures/Fat_Cat.jpg b/pelican/tests/output/custom/static/pictures/Fat_Cat.jpg similarity index 100% rename from tests/output/custom/static/pictures/Fat_Cat.jpg rename to pelican/tests/output/custom/static/pictures/Fat_Cat.jpg diff --git a/tests/output/custom/static/pictures/Sushi.jpg b/pelican/tests/output/custom/static/pictures/Sushi.jpg similarity index 100% rename from tests/output/custom/static/pictures/Sushi.jpg rename to pelican/tests/output/custom/static/pictures/Sushi.jpg diff --git a/tests/output/custom/static/pictures/Sushi_Macro.jpg b/pelican/tests/output/custom/static/pictures/Sushi_Macro.jpg similarity index 100% rename from tests/output/custom/static/pictures/Sushi_Macro.jpg rename to pelican/tests/output/custom/static/pictures/Sushi_Macro.jpg diff --git a/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html similarity index 100% rename from tests/output/custom/tag/bar.html rename to pelican/tests/output/custom/tag/bar.html diff --git a/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html similarity index 100% rename from tests/output/custom/tag/baz.html rename to pelican/tests/output/custom/tag/baz.html diff --git a/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html similarity index 100% rename from tests/output/custom/tag/foo.html rename to pelican/tests/output/custom/tag/foo.html diff --git a/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html similarity index 100% rename from tests/output/custom/tag/foobar.html rename to pelican/tests/output/custom/tag/foobar.html diff --git a/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html similarity index 100% rename from tests/output/custom/tag/oh.html rename to pelican/tests/output/custom/tag/oh.html diff --git a/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html similarity index 100% rename from tests/output/custom/tag/yeah.html rename to pelican/tests/output/custom/tag/yeah.html diff --git a/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html similarity index 100% rename from tests/output/custom/tags.html rename to pelican/tests/output/custom/tags.html diff --git a/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css similarity index 100% rename from tests/output/custom/theme/css/main.css rename to pelican/tests/output/custom/theme/css/main.css diff --git a/tests/output/custom/theme/css/pygment.css b/pelican/tests/output/custom/theme/css/pygment.css similarity index 100% rename from tests/output/custom/theme/css/pygment.css rename to pelican/tests/output/custom/theme/css/pygment.css diff --git a/tests/output/custom/theme/css/reset.css b/pelican/tests/output/custom/theme/css/reset.css similarity index 100% rename from tests/output/custom/theme/css/reset.css rename to pelican/tests/output/custom/theme/css/reset.css diff --git a/tests/output/custom/theme/css/typogrify.css b/pelican/tests/output/custom/theme/css/typogrify.css similarity index 100% rename from tests/output/custom/theme/css/typogrify.css rename to pelican/tests/output/custom/theme/css/typogrify.css diff --git a/tests/output/custom/theme/css/wide.css b/pelican/tests/output/custom/theme/css/wide.css similarity index 100% rename from tests/output/custom/theme/css/wide.css rename to pelican/tests/output/custom/theme/css/wide.css diff --git a/tests/output/custom/theme/images/icons/delicious.png b/pelican/tests/output/custom/theme/images/icons/delicious.png similarity index 100% rename from tests/output/custom/theme/images/icons/delicious.png rename to pelican/tests/output/custom/theme/images/icons/delicious.png diff --git a/tests/output/custom/theme/images/icons/facebook.png b/pelican/tests/output/custom/theme/images/icons/facebook.png similarity index 100% rename from tests/output/custom/theme/images/icons/facebook.png rename to pelican/tests/output/custom/theme/images/icons/facebook.png diff --git a/tests/output/custom/theme/images/icons/gitorious.png b/pelican/tests/output/custom/theme/images/icons/gitorious.png similarity index 100% rename from tests/output/custom/theme/images/icons/gitorious.png rename to pelican/tests/output/custom/theme/images/icons/gitorious.png diff --git a/tests/output/custom/theme/images/icons/lastfm.png b/pelican/tests/output/custom/theme/images/icons/lastfm.png similarity index 100% rename from tests/output/custom/theme/images/icons/lastfm.png rename to pelican/tests/output/custom/theme/images/icons/lastfm.png diff --git a/tests/output/custom/theme/images/icons/linkedin.png b/pelican/tests/output/custom/theme/images/icons/linkedin.png similarity index 100% rename from tests/output/custom/theme/images/icons/linkedin.png rename to pelican/tests/output/custom/theme/images/icons/linkedin.png diff --git a/tests/output/custom/theme/images/icons/rss.png b/pelican/tests/output/custom/theme/images/icons/rss.png similarity index 100% rename from tests/output/custom/theme/images/icons/rss.png rename to pelican/tests/output/custom/theme/images/icons/rss.png diff --git a/tests/output/custom/theme/images/icons/twitter.png b/pelican/tests/output/custom/theme/images/icons/twitter.png similarity index 100% rename from tests/output/custom/theme/images/icons/twitter.png rename to pelican/tests/output/custom/theme/images/icons/twitter.png diff --git a/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html similarity index 100% rename from tests/output/custom/this-is-a-super-article.html rename to pelican/tests/output/custom/this-is-a-super-article.html diff --git a/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html similarity index 100% rename from tests/output/custom/unbelievable.html rename to pelican/tests/output/custom/unbelievable.html diff --git a/tests/support.py b/pelican/tests/support.py similarity index 100% rename from tests/support.py rename to pelican/tests/support.py diff --git a/tests/test_contents.py b/pelican/tests/test_contents.py similarity index 100% rename from tests/test_contents.py rename to pelican/tests/test_contents.py diff --git a/tests/test_generators.py b/pelican/tests/test_generators.py similarity index 100% rename from tests/test_generators.py rename to pelican/tests/test_generators.py diff --git a/tests/test_importer.py b/pelican/tests/test_importer.py similarity index 100% rename from tests/test_importer.py rename to pelican/tests/test_importer.py diff --git a/tests/test_pelican.py b/pelican/tests/test_pelican.py similarity index 97% rename from tests/test_pelican.py rename to pelican/tests/test_pelican.py index 78f083f9d..9cb6a479c 100644 --- a/tests/test_pelican.py +++ b/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") diff --git a/tests/test_readers.py b/pelican/tests/test_readers.py similarity index 100% rename from tests/test_readers.py rename to pelican/tests/test_readers.py diff --git a/tests/test_settings.py b/pelican/tests/test_settings.py similarity index 100% rename from tests/test_settings.py rename to pelican/tests/test_settings.py diff --git a/tests/test_utils.py b/pelican/tests/test_utils.py similarity index 100% rename from tests/test_utils.py rename to pelican/tests/test_utils.py diff --git a/setup.py b/setup.py index 97c8ca646..82c2556ad 100755 --- a/setup.py +++ b/setup.py @@ -41,5 +41,5 @@ 'Topic :: Internet :: WWW/HTTP', 'Topic :: Software Development :: Libraries :: Python Modules', ], - test_suite='tests', + test_suite='pelican.tests', ) diff --git a/tox.ini b/tox.ini index a7dc9ec6d..1bfe64569 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = py26,py27 [testenv] -commands = nosetests -s tests +commands = nosetests -s pelican deps = nose Jinja2