From 0a9f3a7c682cb02c2138729e6d0bc12644751c52 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Sat, 7 Nov 2015 23:03:34 -0500 Subject: [PATCH] Hoist tests out of the core package Tests are not part of the core logic of Hyde, and they should not be packaged as such. --- MANIFEST.in | 2 +- {hyde/tests => tests}/README.rst | 2 +- {hyde/tests => tests}/__init__.py | 0 {hyde/tests => tests}/ext/__init__.py | 0 {hyde/tests => tests}/ext/combine/script.1.js | 0 {hyde/tests => tests}/ext/combine/script.2.js | 0 {hyde/tests => tests}/ext/combine/script.3.js | 0 {hyde/tests => tests}/ext/images/landscape.jpg | Bin {hyde/tests => tests}/ext/images/portrait.jpg | Bin {hyde/tests => tests}/ext/less/expected-site.css | 0 {hyde/tests => tests}/ext/less/inc/mixin.less | 0 {hyde/tests => tests}/ext/less/inc/reset.css | 0 {hyde/tests => tests}/ext/less/inc/vars.less | 0 {hyde/tests => tests}/ext/less/site.less | 0 {hyde/tests => tests}/ext/optipng/hyde-lt-b.png | Bin {hyde/tests => tests}/ext/requirejs/app.js | 0 {hyde/tests => tests}/ext/requirejs/lib/less.js | 0 {hyde/tests => tests}/ext/requirejs/lib/more.js | 0 {hyde/tests => tests}/ext/requirejs/main.js | 0 {hyde/tests => tests}/ext/requirejs/rjs.conf | 0 {hyde/tests => tests}/ext/scss/expected-sass.css | 0 {hyde/tests => tests}/ext/scss/expected-site.css | 0 {hyde/tests => tests}/ext/scss/inc/mixin.scss | 0 {hyde/tests => tests}/ext/scss/inc/reset.css | 0 {hyde/tests => tests}/ext/scss/inc/vars.scss | 0 {hyde/tests => tests}/ext/scss/sass.scss | 0 {hyde/tests => tests}/ext/scss/site.scss | 0 .../ext/stylus/expected-site-compressed.css | 0 .../tests => tests}/ext/stylus/expected-site.css | 0 {hyde/tests => tests}/ext/stylus/inc/mixin.styl | 0 {hyde/tests => tests}/ext/stylus/inc/reset.css | 0 {hyde/tests => tests}/ext/stylus/inc/vars.styl | 0 {hyde/tests => tests}/ext/stylus/site.styl | 0 {hyde/tests => tests}/ext/test_auto_extend.py | 0 {hyde/tests => tests}/ext/test_blockdown.py | 0 {hyde/tests => tests}/ext/test_combine.py | 0 {hyde/tests => tests}/ext/test_depends.py | 0 {hyde/tests => tests}/ext/test_drafts.py | 0 {hyde/tests => tests}/ext/test_flattener.py | 0 {hyde/tests => tests}/ext/test_grouper.py | 3 ++- {hyde/tests => tests}/ext/test_images.py | 0 {hyde/tests => tests}/ext/test_less.py | 0 {hyde/tests => tests}/ext/test_markings.py | 0 {hyde/tests => tests}/ext/test_meta.py | 0 {hyde/tests => tests}/ext/test_optipng.py | 0 {hyde/tests => tests}/ext/test_paginator.py | 0 {hyde/tests => tests}/ext/test_requirejs.py | 0 {hyde/tests => tests}/ext/test_sass.py | 3 ++- {hyde/tests => tests}/ext/test_scss.py | 3 ++- {hyde/tests => tests}/ext/test_sorter.py | 0 {hyde/tests => tests}/ext/test_stylus.py | 0 {hyde/tests => tests}/ext/test_syntext.py | 0 {hyde/tests => tests}/ext/test_tagger.py | 0 {hyde/tests => tests}/ext/test_textlinks.py | 0 {hyde/tests => tests}/ext/test_uglify.py | 4 +++- {hyde/tests => tests}/ext/test_urlcleaner.py | 0 .../ext/uglify/expected-jquery-nc.js | 0 .../tests => tests}/ext/uglify/expected-jquery.js | 0 {hyde/tests => tests}/ext/uglify/jquery.js | 0 .../sites/test_grouper/alternate.yaml | 0 .../sites/test_grouper/content/404.html | 0 .../sites/test_grouper/content/about.html | 0 .../test_grouper/content/apple-touch-icon.png | Bin .../test_grouper/content/blog/installation.html | 0 .../sites/test_grouper/content/blog/meta.yaml | 0 .../sites/test_grouper/content/blog/overview.html | 0 .../sites/test_grouper/content/blog/plugins.html | 0 .../sites/test_grouper/content/blog/tags.html | 0 .../test_grouper/content/blog/templating.html | 0 .../sites/test_grouper/content/crossdomain.xml | 0 .../sites/test_grouper/content/favicon.ico | Bin .../sites/test_grouper/content/media/css/site.css | 0 .../sites/test_grouper/content/robots.txt | 0 .../tests => tests}/sites/test_grouper/info.yaml | 0 .../sites/test_grouper/layout/base.html | 0 .../sites/test_grouper/layout/blog/post.html | 0 .../sites/test_grouper/layout/root.html | 0 .../tests => tests}/sites/test_grouper/site.yaml | 0 .../sites/test_jinja/alternate.yaml | 0 .../sites/test_jinja/content/404.html | 0 .../sites/test_jinja/content/about.html | 0 .../sites/test_jinja/content/apple-touch-icon.png | Bin .../blog/2010/december/merry-christmas.html | 0 .../sites/test_jinja/content/crossdomain.xml | 0 .../sites/test_jinja/content/favicon.ico | Bin .../sites/test_jinja/content/media/css/site.css | 0 .../sites/test_jinja/content/robots.txt | 0 {hyde/tests => tests}/sites/test_jinja/info.yaml | 0 .../sites/test_jinja/layout/base.html | 0 .../sites/test_jinja/layout/blog/post.html | 0 .../sites/test_jinja/layout/root.html | 0 {hyde/tests => tests}/sites/test_jinja/site.yaml | 0 .../test_paginator/content/blog/angry-post.html | 0 .../content/blog/another-sad-post.html | 0 .../test_paginator/content/blog/happy-post.html | 0 .../test_paginator/content/blog/sad-post.html | 0 .../content/custom_file_pattern.txt | 0 .../sites/test_paginator/content/empty.txt | 0 .../sites/test_paginator/content/pages_of_one.txt | 0 .../sites/test_paginator/content/pages_of_ten.txt | 0 .../sites/test_paginator/layout/root.j2 | 0 .../sites/test_paginator/site.yaml | 0 .../sites/test_sorter/content/404.html | 0 .../sites/test_sorter/content/about.html | 0 .../test_sorter/content/apple-touch-icon.png | Bin .../blog/2010/december/merry-christmas.html | 0 .../test_sorter/content/blog/angry-post.html | 0 .../content/blog/another-sad-post.html | 0 .../test_sorter/content/blog/happy-post.html | 0 .../sites/test_sorter/content/blog/sad-post.html | 0 .../sites/test_sorter/content/crossdomain.xml | 0 .../sites/test_sorter/content/favicon.ico | Bin .../sites/test_sorter/content/media/css/site.css | 0 .../sites/test_sorter/content/robots.txt | 0 .../sites/test_sorter/layout/root.j2 | 0 .../sites/test_sorter/layout/tagged_posts.j2 | 0 {hyde/tests => tests}/sites/test_sorter/site.yaml | 0 .../test_tagger/content/blog/angry-post.html | 0 .../content/blog/another-sad-post.html | 0 .../test_tagger/content/blog/happy-post.html | 0 .../sites/test_tagger/content/blog/sad-post.html | 0 .../sites/test_tagger/layout/root.j2 | 0 .../sites/test_tagger/layout/tagged_posts.j2 | 0 {hyde/tests => tests}/sites/test_tagger/site.yaml | 0 {hyde/tests => tests}/ssp/ext/__init__.py | 0 {hyde/tests => tests}/ssp/ext/banner.py | 0 {hyde/tests => tests}/ssp/site.yaml | 0 .../tests => tests}/templates/jinja2/helpers.html | 0 {hyde/tests => tests}/templates/jinja2/index.html | 0 .../templates/jinja2/index_expected.html | 0 .../tests => tests}/templates/jinja2/layout.html | 0 {hyde/tests => tests}/test_generate.py | 0 {hyde/tests => tests}/test_initialize.py | 0 {hyde/tests => tests}/test_jinja2template.py | 0 {hyde/tests => tests}/test_layout.py | 0 {hyde/tests => tests}/test_model.py | 0 {hyde/tests => tests}/test_plugin.py | 14 +++++++------- {hyde/tests => tests}/test_simple_copy.py | 0 {hyde/tests => tests}/test_site.py | 0 {hyde/tests => tests}/util.py | 0 140 files changed, 18 insertions(+), 13 deletions(-) rename {hyde/tests => tests}/README.rst (97%) rename {hyde/tests => tests}/__init__.py (100%) rename {hyde/tests => tests}/ext/__init__.py (100%) rename {hyde/tests => tests}/ext/combine/script.1.js (100%) rename {hyde/tests => tests}/ext/combine/script.2.js (100%) rename {hyde/tests => tests}/ext/combine/script.3.js (100%) rename {hyde/tests => tests}/ext/images/landscape.jpg (100%) rename {hyde/tests => tests}/ext/images/portrait.jpg (100%) rename {hyde/tests => tests}/ext/less/expected-site.css (100%) rename {hyde/tests => tests}/ext/less/inc/mixin.less (100%) rename {hyde/tests => tests}/ext/less/inc/reset.css (100%) rename {hyde/tests => tests}/ext/less/inc/vars.less (100%) rename {hyde/tests => tests}/ext/less/site.less (100%) rename {hyde/tests => tests}/ext/optipng/hyde-lt-b.png (100%) rename {hyde/tests => tests}/ext/requirejs/app.js (100%) rename {hyde/tests => tests}/ext/requirejs/lib/less.js (100%) rename {hyde/tests => tests}/ext/requirejs/lib/more.js (100%) rename {hyde/tests => tests}/ext/requirejs/main.js (100%) rename {hyde/tests => tests}/ext/requirejs/rjs.conf (100%) rename {hyde/tests => tests}/ext/scss/expected-sass.css (100%) rename {hyde/tests => tests}/ext/scss/expected-site.css (100%) rename {hyde/tests => tests}/ext/scss/inc/mixin.scss (100%) rename {hyde/tests => tests}/ext/scss/inc/reset.css (100%) rename {hyde/tests => tests}/ext/scss/inc/vars.scss (100%) rename {hyde/tests => tests}/ext/scss/sass.scss (100%) rename {hyde/tests => tests}/ext/scss/site.scss (100%) rename {hyde/tests => tests}/ext/stylus/expected-site-compressed.css (100%) rename {hyde/tests => tests}/ext/stylus/expected-site.css (100%) rename {hyde/tests => tests}/ext/stylus/inc/mixin.styl (100%) rename {hyde/tests => tests}/ext/stylus/inc/reset.css (100%) rename {hyde/tests => tests}/ext/stylus/inc/vars.styl (100%) rename {hyde/tests => tests}/ext/stylus/site.styl (100%) rename {hyde/tests => tests}/ext/test_auto_extend.py (100%) rename {hyde/tests => tests}/ext/test_blockdown.py (100%) rename {hyde/tests => tests}/ext/test_combine.py (100%) rename {hyde/tests => tests}/ext/test_depends.py (100%) rename {hyde/tests => tests}/ext/test_drafts.py (100%) rename {hyde/tests => tests}/ext/test_flattener.py (100%) rename {hyde/tests => tests}/ext/test_grouper.py (99%) rename {hyde/tests => tests}/ext/test_images.py (100%) rename {hyde/tests => tests}/ext/test_less.py (100%) rename {hyde/tests => tests}/ext/test_markings.py (100%) rename {hyde/tests => tests}/ext/test_meta.py (100%) rename {hyde/tests => tests}/ext/test_optipng.py (100%) rename {hyde/tests => tests}/ext/test_paginator.py (100%) rename {hyde/tests => tests}/ext/test_requirejs.py (100%) rename {hyde/tests => tests}/ext/test_sass.py (97%) rename {hyde/tests => tests}/ext/test_scss.py (96%) rename {hyde/tests => tests}/ext/test_sorter.py (100%) rename {hyde/tests => tests}/ext/test_stylus.py (100%) rename {hyde/tests => tests}/ext/test_syntext.py (100%) rename {hyde/tests => tests}/ext/test_tagger.py (100%) rename {hyde/tests => tests}/ext/test_textlinks.py (100%) rename {hyde/tests => tests}/ext/test_uglify.py (98%) rename {hyde/tests => tests}/ext/test_urlcleaner.py (100%) rename {hyde/tests => tests}/ext/uglify/expected-jquery-nc.js (100%) rename {hyde/tests => tests}/ext/uglify/expected-jquery.js (100%) rename {hyde/tests => tests}/ext/uglify/jquery.js (100%) rename {hyde/tests => tests}/sites/test_grouper/alternate.yaml (100%) rename {hyde/tests => tests}/sites/test_grouper/content/404.html (100%) rename {hyde/tests => tests}/sites/test_grouper/content/about.html (100%) rename {hyde/tests => tests}/sites/test_grouper/content/apple-touch-icon.png (100%) rename {hyde/tests => tests}/sites/test_grouper/content/blog/installation.html (100%) rename {hyde/tests => tests}/sites/test_grouper/content/blog/meta.yaml (100%) rename {hyde/tests => tests}/sites/test_grouper/content/blog/overview.html (100%) rename {hyde/tests => tests}/sites/test_grouper/content/blog/plugins.html (100%) rename {hyde/tests => tests}/sites/test_grouper/content/blog/tags.html (100%) rename {hyde/tests => tests}/sites/test_grouper/content/blog/templating.html (100%) rename {hyde/tests => tests}/sites/test_grouper/content/crossdomain.xml (100%) rename {hyde/tests => tests}/sites/test_grouper/content/favicon.ico (100%) rename {hyde/tests => tests}/sites/test_grouper/content/media/css/site.css (100%) rename {hyde/tests => tests}/sites/test_grouper/content/robots.txt (100%) rename {hyde/tests => tests}/sites/test_grouper/info.yaml (100%) rename {hyde/tests => tests}/sites/test_grouper/layout/base.html (100%) rename {hyde/tests => tests}/sites/test_grouper/layout/blog/post.html (100%) rename {hyde/tests => tests}/sites/test_grouper/layout/root.html (100%) rename {hyde/tests => tests}/sites/test_grouper/site.yaml (100%) rename {hyde/tests => tests}/sites/test_jinja/alternate.yaml (100%) rename {hyde/tests => tests}/sites/test_jinja/content/404.html (100%) rename {hyde/tests => tests}/sites/test_jinja/content/about.html (100%) rename {hyde/tests => tests}/sites/test_jinja/content/apple-touch-icon.png (100%) rename {hyde/tests => tests}/sites/test_jinja/content/blog/2010/december/merry-christmas.html (100%) rename {hyde/tests => tests}/sites/test_jinja/content/crossdomain.xml (100%) rename {hyde/tests => tests}/sites/test_jinja/content/favicon.ico (100%) rename {hyde/tests => tests}/sites/test_jinja/content/media/css/site.css (100%) rename {hyde/tests => tests}/sites/test_jinja/content/robots.txt (100%) rename {hyde/tests => tests}/sites/test_jinja/info.yaml (100%) rename {hyde/tests => tests}/sites/test_jinja/layout/base.html (100%) rename {hyde/tests => tests}/sites/test_jinja/layout/blog/post.html (100%) rename {hyde/tests => tests}/sites/test_jinja/layout/root.html (100%) rename {hyde/tests => tests}/sites/test_jinja/site.yaml (100%) rename {hyde/tests => tests}/sites/test_paginator/content/blog/angry-post.html (100%) rename {hyde/tests => tests}/sites/test_paginator/content/blog/another-sad-post.html (100%) rename {hyde/tests => tests}/sites/test_paginator/content/blog/happy-post.html (100%) rename {hyde/tests => tests}/sites/test_paginator/content/blog/sad-post.html (100%) rename {hyde/tests => tests}/sites/test_paginator/content/custom_file_pattern.txt (100%) rename {hyde/tests => tests}/sites/test_paginator/content/empty.txt (100%) rename {hyde/tests => tests}/sites/test_paginator/content/pages_of_one.txt (100%) rename {hyde/tests => tests}/sites/test_paginator/content/pages_of_ten.txt (100%) rename {hyde/tests => tests}/sites/test_paginator/layout/root.j2 (100%) rename {hyde/tests => tests}/sites/test_paginator/site.yaml (100%) rename {hyde/tests => tests}/sites/test_sorter/content/404.html (100%) rename {hyde/tests => tests}/sites/test_sorter/content/about.html (100%) rename {hyde/tests => tests}/sites/test_sorter/content/apple-touch-icon.png (100%) rename {hyde/tests => tests}/sites/test_sorter/content/blog/2010/december/merry-christmas.html (100%) rename {hyde/tests => tests}/sites/test_sorter/content/blog/angry-post.html (100%) rename {hyde/tests => tests}/sites/test_sorter/content/blog/another-sad-post.html (100%) rename {hyde/tests => tests}/sites/test_sorter/content/blog/happy-post.html (100%) rename {hyde/tests => tests}/sites/test_sorter/content/blog/sad-post.html (100%) rename {hyde/tests => tests}/sites/test_sorter/content/crossdomain.xml (100%) rename {hyde/tests => tests}/sites/test_sorter/content/favicon.ico (100%) rename {hyde/tests => tests}/sites/test_sorter/content/media/css/site.css (100%) rename {hyde/tests => tests}/sites/test_sorter/content/robots.txt (100%) rename {hyde/tests => tests}/sites/test_sorter/layout/root.j2 (100%) rename {hyde/tests => tests}/sites/test_sorter/layout/tagged_posts.j2 (100%) rename {hyde/tests => tests}/sites/test_sorter/site.yaml (100%) rename {hyde/tests => tests}/sites/test_tagger/content/blog/angry-post.html (100%) rename {hyde/tests => tests}/sites/test_tagger/content/blog/another-sad-post.html (100%) rename {hyde/tests => tests}/sites/test_tagger/content/blog/happy-post.html (100%) rename {hyde/tests => tests}/sites/test_tagger/content/blog/sad-post.html (100%) rename {hyde/tests => tests}/sites/test_tagger/layout/root.j2 (100%) rename {hyde/tests => tests}/sites/test_tagger/layout/tagged_posts.j2 (100%) rename {hyde/tests => tests}/sites/test_tagger/site.yaml (100%) rename {hyde/tests => tests}/ssp/ext/__init__.py (100%) rename {hyde/tests => tests}/ssp/ext/banner.py (100%) rename {hyde/tests => tests}/ssp/site.yaml (100%) rename {hyde/tests => tests}/templates/jinja2/helpers.html (100%) rename {hyde/tests => tests}/templates/jinja2/index.html (100%) rename {hyde/tests => tests}/templates/jinja2/index_expected.html (100%) rename {hyde/tests => tests}/templates/jinja2/layout.html (100%) rename {hyde/tests => tests}/test_generate.py (100%) rename {hyde/tests => tests}/test_initialize.py (100%) rename {hyde/tests => tests}/test_jinja2template.py (100%) rename {hyde/tests => tests}/test_layout.py (100%) rename {hyde/tests => tests}/test_model.py (100%) rename {hyde/tests => tests}/test_plugin.py (97%) rename {hyde/tests => tests}/test_simple_copy.py (100%) rename {hyde/tests => tests}/test_site.py (100%) rename {hyde/tests => tests}/util.py (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 827e862..54acb6f 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,5 +8,5 @@ include requirements.txt include dev-req.txt include dev-only.txt recursive-include hyde *.py -recursive-include hyde/tests *.py +recursive-include tests *.py recursive-include hyde/layouts *.* diff --git a/hyde/tests/README.rst b/tests/README.rst similarity index 97% rename from hyde/tests/README.rst rename to tests/README.rst index ca41e13..d88e597 100644 --- a/hyde/tests/README.rst +++ b/tests/README.rst @@ -42,4 +42,4 @@ Run the tests ============= :: - nosetests hyde/tests \ No newline at end of file + nosetests tests diff --git a/hyde/tests/__init__.py b/tests/__init__.py similarity index 100% rename from hyde/tests/__init__.py rename to tests/__init__.py diff --git a/hyde/tests/ext/__init__.py b/tests/ext/__init__.py similarity index 100% rename from hyde/tests/ext/__init__.py rename to tests/ext/__init__.py diff --git a/hyde/tests/ext/combine/script.1.js b/tests/ext/combine/script.1.js similarity index 100% rename from hyde/tests/ext/combine/script.1.js rename to tests/ext/combine/script.1.js diff --git a/hyde/tests/ext/combine/script.2.js b/tests/ext/combine/script.2.js similarity index 100% rename from hyde/tests/ext/combine/script.2.js rename to tests/ext/combine/script.2.js diff --git a/hyde/tests/ext/combine/script.3.js b/tests/ext/combine/script.3.js similarity index 100% rename from hyde/tests/ext/combine/script.3.js rename to tests/ext/combine/script.3.js diff --git a/hyde/tests/ext/images/landscape.jpg b/tests/ext/images/landscape.jpg similarity index 100% rename from hyde/tests/ext/images/landscape.jpg rename to tests/ext/images/landscape.jpg diff --git a/hyde/tests/ext/images/portrait.jpg b/tests/ext/images/portrait.jpg similarity index 100% rename from hyde/tests/ext/images/portrait.jpg rename to tests/ext/images/portrait.jpg diff --git a/hyde/tests/ext/less/expected-site.css b/tests/ext/less/expected-site.css similarity index 100% rename from hyde/tests/ext/less/expected-site.css rename to tests/ext/less/expected-site.css diff --git a/hyde/tests/ext/less/inc/mixin.less b/tests/ext/less/inc/mixin.less similarity index 100% rename from hyde/tests/ext/less/inc/mixin.less rename to tests/ext/less/inc/mixin.less diff --git a/hyde/tests/ext/less/inc/reset.css b/tests/ext/less/inc/reset.css similarity index 100% rename from hyde/tests/ext/less/inc/reset.css rename to tests/ext/less/inc/reset.css diff --git a/hyde/tests/ext/less/inc/vars.less b/tests/ext/less/inc/vars.less similarity index 100% rename from hyde/tests/ext/less/inc/vars.less rename to tests/ext/less/inc/vars.less diff --git a/hyde/tests/ext/less/site.less b/tests/ext/less/site.less similarity index 100% rename from hyde/tests/ext/less/site.less rename to tests/ext/less/site.less diff --git a/hyde/tests/ext/optipng/hyde-lt-b.png b/tests/ext/optipng/hyde-lt-b.png similarity index 100% rename from hyde/tests/ext/optipng/hyde-lt-b.png rename to tests/ext/optipng/hyde-lt-b.png diff --git a/hyde/tests/ext/requirejs/app.js b/tests/ext/requirejs/app.js similarity index 100% rename from hyde/tests/ext/requirejs/app.js rename to tests/ext/requirejs/app.js diff --git a/hyde/tests/ext/requirejs/lib/less.js b/tests/ext/requirejs/lib/less.js similarity index 100% rename from hyde/tests/ext/requirejs/lib/less.js rename to tests/ext/requirejs/lib/less.js diff --git a/hyde/tests/ext/requirejs/lib/more.js b/tests/ext/requirejs/lib/more.js similarity index 100% rename from hyde/tests/ext/requirejs/lib/more.js rename to tests/ext/requirejs/lib/more.js diff --git a/hyde/tests/ext/requirejs/main.js b/tests/ext/requirejs/main.js similarity index 100% rename from hyde/tests/ext/requirejs/main.js rename to tests/ext/requirejs/main.js diff --git a/hyde/tests/ext/requirejs/rjs.conf b/tests/ext/requirejs/rjs.conf similarity index 100% rename from hyde/tests/ext/requirejs/rjs.conf rename to tests/ext/requirejs/rjs.conf diff --git a/hyde/tests/ext/scss/expected-sass.css b/tests/ext/scss/expected-sass.css similarity index 100% rename from hyde/tests/ext/scss/expected-sass.css rename to tests/ext/scss/expected-sass.css diff --git a/hyde/tests/ext/scss/expected-site.css b/tests/ext/scss/expected-site.css similarity index 100% rename from hyde/tests/ext/scss/expected-site.css rename to tests/ext/scss/expected-site.css diff --git a/hyde/tests/ext/scss/inc/mixin.scss b/tests/ext/scss/inc/mixin.scss similarity index 100% rename from hyde/tests/ext/scss/inc/mixin.scss rename to tests/ext/scss/inc/mixin.scss diff --git a/hyde/tests/ext/scss/inc/reset.css b/tests/ext/scss/inc/reset.css similarity index 100% rename from hyde/tests/ext/scss/inc/reset.css rename to tests/ext/scss/inc/reset.css diff --git a/hyde/tests/ext/scss/inc/vars.scss b/tests/ext/scss/inc/vars.scss similarity index 100% rename from hyde/tests/ext/scss/inc/vars.scss rename to tests/ext/scss/inc/vars.scss diff --git a/hyde/tests/ext/scss/sass.scss b/tests/ext/scss/sass.scss similarity index 100% rename from hyde/tests/ext/scss/sass.scss rename to tests/ext/scss/sass.scss diff --git a/hyde/tests/ext/scss/site.scss b/tests/ext/scss/site.scss similarity index 100% rename from hyde/tests/ext/scss/site.scss rename to tests/ext/scss/site.scss diff --git a/hyde/tests/ext/stylus/expected-site-compressed.css b/tests/ext/stylus/expected-site-compressed.css similarity index 100% rename from hyde/tests/ext/stylus/expected-site-compressed.css rename to tests/ext/stylus/expected-site-compressed.css diff --git a/hyde/tests/ext/stylus/expected-site.css b/tests/ext/stylus/expected-site.css similarity index 100% rename from hyde/tests/ext/stylus/expected-site.css rename to tests/ext/stylus/expected-site.css diff --git a/hyde/tests/ext/stylus/inc/mixin.styl b/tests/ext/stylus/inc/mixin.styl similarity index 100% rename from hyde/tests/ext/stylus/inc/mixin.styl rename to tests/ext/stylus/inc/mixin.styl diff --git a/hyde/tests/ext/stylus/inc/reset.css b/tests/ext/stylus/inc/reset.css similarity index 100% rename from hyde/tests/ext/stylus/inc/reset.css rename to tests/ext/stylus/inc/reset.css diff --git a/hyde/tests/ext/stylus/inc/vars.styl b/tests/ext/stylus/inc/vars.styl similarity index 100% rename from hyde/tests/ext/stylus/inc/vars.styl rename to tests/ext/stylus/inc/vars.styl diff --git a/hyde/tests/ext/stylus/site.styl b/tests/ext/stylus/site.styl similarity index 100% rename from hyde/tests/ext/stylus/site.styl rename to tests/ext/stylus/site.styl diff --git a/hyde/tests/ext/test_auto_extend.py b/tests/ext/test_auto_extend.py similarity index 100% rename from hyde/tests/ext/test_auto_extend.py rename to tests/ext/test_auto_extend.py diff --git a/hyde/tests/ext/test_blockdown.py b/tests/ext/test_blockdown.py similarity index 100% rename from hyde/tests/ext/test_blockdown.py rename to tests/ext/test_blockdown.py diff --git a/hyde/tests/ext/test_combine.py b/tests/ext/test_combine.py similarity index 100% rename from hyde/tests/ext/test_combine.py rename to tests/ext/test_combine.py diff --git a/hyde/tests/ext/test_depends.py b/tests/ext/test_depends.py similarity index 100% rename from hyde/tests/ext/test_depends.py rename to tests/ext/test_depends.py diff --git a/hyde/tests/ext/test_drafts.py b/tests/ext/test_drafts.py similarity index 100% rename from hyde/tests/ext/test_drafts.py rename to tests/ext/test_drafts.py diff --git a/hyde/tests/ext/test_flattener.py b/tests/ext/test_flattener.py similarity index 100% rename from hyde/tests/ext/test_flattener.py rename to tests/ext/test_flattener.py diff --git a/hyde/tests/ext/test_grouper.py b/tests/ext/test_grouper.py similarity index 99% rename from hyde/tests/ext/test_grouper.py rename to tests/ext/test_grouper.py index 4cfb458..216f1ce 100644 --- a/hyde/tests/ext/test_grouper.py +++ b/tests/ext/test_grouper.py @@ -10,9 +10,10 @@ from hyde.site import Site from hyde.model import Config, Expando from fswrap import File -from hyde.tests.util import assert_html_equals import yaml +from ..util import assert_html_equals + TEST_SITE = File(__file__).parent.parent.child_folder('_test') diff --git a/hyde/tests/ext/test_images.py b/tests/ext/test_images.py similarity index 100% rename from hyde/tests/ext/test_images.py rename to tests/ext/test_images.py diff --git a/hyde/tests/ext/test_less.py b/tests/ext/test_less.py similarity index 100% rename from hyde/tests/ext/test_less.py rename to tests/ext/test_less.py diff --git a/hyde/tests/ext/test_markings.py b/tests/ext/test_markings.py similarity index 100% rename from hyde/tests/ext/test_markings.py rename to tests/ext/test_markings.py diff --git a/hyde/tests/ext/test_meta.py b/tests/ext/test_meta.py similarity index 100% rename from hyde/tests/ext/test_meta.py rename to tests/ext/test_meta.py diff --git a/hyde/tests/ext/test_optipng.py b/tests/ext/test_optipng.py similarity index 100% rename from hyde/tests/ext/test_optipng.py rename to tests/ext/test_optipng.py diff --git a/hyde/tests/ext/test_paginator.py b/tests/ext/test_paginator.py similarity index 100% rename from hyde/tests/ext/test_paginator.py rename to tests/ext/test_paginator.py diff --git a/hyde/tests/ext/test_requirejs.py b/tests/ext/test_requirejs.py similarity index 100% rename from hyde/tests/ext/test_requirejs.py rename to tests/ext/test_requirejs.py diff --git a/hyde/tests/ext/test_sass.py b/tests/ext/test_sass.py similarity index 97% rename from hyde/tests/ext/test_sass.py rename to tests/ext/test_sass.py index e748c57..fa0b5f0 100644 --- a/hyde/tests/ext/test_sass.py +++ b/tests/ext/test_sass.py @@ -6,10 +6,11 @@ Use nose """ from hyde.generator import Generator from hyde.site import Site -from hyde.tests.util import assert_no_diff from fswrap import File, Folder +from ..util import assert_no_diff + SCSS_SOURCE = File(__file__).parent.child_folder('scss') TEST_SITE = File(__file__).parent.parent.child_folder('_test') diff --git a/hyde/tests/ext/test_scss.py b/tests/ext/test_scss.py similarity index 96% rename from hyde/tests/ext/test_scss.py rename to tests/ext/test_scss.py index 1a4a66f..c22b216 100644 --- a/hyde/tests/ext/test_scss.py +++ b/tests/ext/test_scss.py @@ -6,10 +6,11 @@ Use nose """ from hyde.generator import Generator from hyde.site import Site -from hyde.tests.util import assert_no_diff from fswrap import File, Folder +from ..util import assert_no_diff + SCSS_SOURCE = File(__file__).parent.child_folder('scss') TEST_SITE = File(__file__).parent.parent.child_folder('_test') diff --git a/hyde/tests/ext/test_sorter.py b/tests/ext/test_sorter.py similarity index 100% rename from hyde/tests/ext/test_sorter.py rename to tests/ext/test_sorter.py diff --git a/hyde/tests/ext/test_stylus.py b/tests/ext/test_stylus.py similarity index 100% rename from hyde/tests/ext/test_stylus.py rename to tests/ext/test_stylus.py diff --git a/hyde/tests/ext/test_syntext.py b/tests/ext/test_syntext.py similarity index 100% rename from hyde/tests/ext/test_syntext.py rename to tests/ext/test_syntext.py diff --git a/hyde/tests/ext/test_tagger.py b/tests/ext/test_tagger.py similarity index 100% rename from hyde/tests/ext/test_tagger.py rename to tests/ext/test_tagger.py diff --git a/hyde/tests/ext/test_textlinks.py b/tests/ext/test_textlinks.py similarity index 100% rename from hyde/tests/ext/test_textlinks.py rename to tests/ext/test_textlinks.py diff --git a/hyde/tests/ext/test_uglify.py b/tests/ext/test_uglify.py similarity index 98% rename from hyde/tests/ext/test_uglify.py rename to tests/ext/test_uglify.py index ad7bd95..3918f68 100644 --- a/hyde/tests/ext/test_uglify.py +++ b/tests/ext/test_uglify.py @@ -4,12 +4,14 @@ Use nose `$ pip install nose` `$ nosetests` """ + from hyde.model import Expando from hyde.generator import Generator from hyde.site import Site from fswrap import File, Folder -from hyde.tests.util import assert_no_diff + +from ..util import assert_no_diff UGLIFY_SOURCE = File(__file__).parent.child_folder('uglify') TEST_SITE = File(__file__).parent.parent.child_folder('_test') diff --git a/hyde/tests/ext/test_urlcleaner.py b/tests/ext/test_urlcleaner.py similarity index 100% rename from hyde/tests/ext/test_urlcleaner.py rename to tests/ext/test_urlcleaner.py diff --git a/hyde/tests/ext/uglify/expected-jquery-nc.js b/tests/ext/uglify/expected-jquery-nc.js similarity index 100% rename from hyde/tests/ext/uglify/expected-jquery-nc.js rename to tests/ext/uglify/expected-jquery-nc.js diff --git a/hyde/tests/ext/uglify/expected-jquery.js b/tests/ext/uglify/expected-jquery.js similarity index 100% rename from hyde/tests/ext/uglify/expected-jquery.js rename to tests/ext/uglify/expected-jquery.js diff --git a/hyde/tests/ext/uglify/jquery.js b/tests/ext/uglify/jquery.js similarity index 100% rename from hyde/tests/ext/uglify/jquery.js rename to tests/ext/uglify/jquery.js diff --git a/hyde/tests/sites/test_grouper/alternate.yaml b/tests/sites/test_grouper/alternate.yaml similarity index 100% rename from hyde/tests/sites/test_grouper/alternate.yaml rename to tests/sites/test_grouper/alternate.yaml diff --git a/hyde/tests/sites/test_grouper/content/404.html b/tests/sites/test_grouper/content/404.html similarity index 100% rename from hyde/tests/sites/test_grouper/content/404.html rename to tests/sites/test_grouper/content/404.html diff --git a/hyde/tests/sites/test_grouper/content/about.html b/tests/sites/test_grouper/content/about.html similarity index 100% rename from hyde/tests/sites/test_grouper/content/about.html rename to tests/sites/test_grouper/content/about.html diff --git a/hyde/tests/sites/test_grouper/content/apple-touch-icon.png b/tests/sites/test_grouper/content/apple-touch-icon.png similarity index 100% rename from hyde/tests/sites/test_grouper/content/apple-touch-icon.png rename to tests/sites/test_grouper/content/apple-touch-icon.png diff --git a/hyde/tests/sites/test_grouper/content/blog/installation.html b/tests/sites/test_grouper/content/blog/installation.html similarity index 100% rename from hyde/tests/sites/test_grouper/content/blog/installation.html rename to tests/sites/test_grouper/content/blog/installation.html diff --git a/hyde/tests/sites/test_grouper/content/blog/meta.yaml b/tests/sites/test_grouper/content/blog/meta.yaml similarity index 100% rename from hyde/tests/sites/test_grouper/content/blog/meta.yaml rename to tests/sites/test_grouper/content/blog/meta.yaml diff --git a/hyde/tests/sites/test_grouper/content/blog/overview.html b/tests/sites/test_grouper/content/blog/overview.html similarity index 100% rename from hyde/tests/sites/test_grouper/content/blog/overview.html rename to tests/sites/test_grouper/content/blog/overview.html diff --git a/hyde/tests/sites/test_grouper/content/blog/plugins.html b/tests/sites/test_grouper/content/blog/plugins.html similarity index 100% rename from hyde/tests/sites/test_grouper/content/blog/plugins.html rename to tests/sites/test_grouper/content/blog/plugins.html diff --git a/hyde/tests/sites/test_grouper/content/blog/tags.html b/tests/sites/test_grouper/content/blog/tags.html similarity index 100% rename from hyde/tests/sites/test_grouper/content/blog/tags.html rename to tests/sites/test_grouper/content/blog/tags.html diff --git a/hyde/tests/sites/test_grouper/content/blog/templating.html b/tests/sites/test_grouper/content/blog/templating.html similarity index 100% rename from hyde/tests/sites/test_grouper/content/blog/templating.html rename to tests/sites/test_grouper/content/blog/templating.html diff --git a/hyde/tests/sites/test_grouper/content/crossdomain.xml b/tests/sites/test_grouper/content/crossdomain.xml similarity index 100% rename from hyde/tests/sites/test_grouper/content/crossdomain.xml rename to tests/sites/test_grouper/content/crossdomain.xml diff --git a/hyde/tests/sites/test_grouper/content/favicon.ico b/tests/sites/test_grouper/content/favicon.ico similarity index 100% rename from hyde/tests/sites/test_grouper/content/favicon.ico rename to tests/sites/test_grouper/content/favicon.ico diff --git a/hyde/tests/sites/test_grouper/content/media/css/site.css b/tests/sites/test_grouper/content/media/css/site.css similarity index 100% rename from hyde/tests/sites/test_grouper/content/media/css/site.css rename to tests/sites/test_grouper/content/media/css/site.css diff --git a/hyde/tests/sites/test_grouper/content/robots.txt b/tests/sites/test_grouper/content/robots.txt similarity index 100% rename from hyde/tests/sites/test_grouper/content/robots.txt rename to tests/sites/test_grouper/content/robots.txt diff --git a/hyde/tests/sites/test_grouper/info.yaml b/tests/sites/test_grouper/info.yaml similarity index 100% rename from hyde/tests/sites/test_grouper/info.yaml rename to tests/sites/test_grouper/info.yaml diff --git a/hyde/tests/sites/test_grouper/layout/base.html b/tests/sites/test_grouper/layout/base.html similarity index 100% rename from hyde/tests/sites/test_grouper/layout/base.html rename to tests/sites/test_grouper/layout/base.html diff --git a/hyde/tests/sites/test_grouper/layout/blog/post.html b/tests/sites/test_grouper/layout/blog/post.html similarity index 100% rename from hyde/tests/sites/test_grouper/layout/blog/post.html rename to tests/sites/test_grouper/layout/blog/post.html diff --git a/hyde/tests/sites/test_grouper/layout/root.html b/tests/sites/test_grouper/layout/root.html similarity index 100% rename from hyde/tests/sites/test_grouper/layout/root.html rename to tests/sites/test_grouper/layout/root.html diff --git a/hyde/tests/sites/test_grouper/site.yaml b/tests/sites/test_grouper/site.yaml similarity index 100% rename from hyde/tests/sites/test_grouper/site.yaml rename to tests/sites/test_grouper/site.yaml diff --git a/hyde/tests/sites/test_jinja/alternate.yaml b/tests/sites/test_jinja/alternate.yaml similarity index 100% rename from hyde/tests/sites/test_jinja/alternate.yaml rename to tests/sites/test_jinja/alternate.yaml diff --git a/hyde/tests/sites/test_jinja/content/404.html b/tests/sites/test_jinja/content/404.html similarity index 100% rename from hyde/tests/sites/test_jinja/content/404.html rename to tests/sites/test_jinja/content/404.html diff --git a/hyde/tests/sites/test_jinja/content/about.html b/tests/sites/test_jinja/content/about.html similarity index 100% rename from hyde/tests/sites/test_jinja/content/about.html rename to tests/sites/test_jinja/content/about.html diff --git a/hyde/tests/sites/test_jinja/content/apple-touch-icon.png b/tests/sites/test_jinja/content/apple-touch-icon.png similarity index 100% rename from hyde/tests/sites/test_jinja/content/apple-touch-icon.png rename to tests/sites/test_jinja/content/apple-touch-icon.png diff --git a/hyde/tests/sites/test_jinja/content/blog/2010/december/merry-christmas.html b/tests/sites/test_jinja/content/blog/2010/december/merry-christmas.html similarity index 100% rename from hyde/tests/sites/test_jinja/content/blog/2010/december/merry-christmas.html rename to tests/sites/test_jinja/content/blog/2010/december/merry-christmas.html diff --git a/hyde/tests/sites/test_jinja/content/crossdomain.xml b/tests/sites/test_jinja/content/crossdomain.xml similarity index 100% rename from hyde/tests/sites/test_jinja/content/crossdomain.xml rename to tests/sites/test_jinja/content/crossdomain.xml diff --git a/hyde/tests/sites/test_jinja/content/favicon.ico b/tests/sites/test_jinja/content/favicon.ico similarity index 100% rename from hyde/tests/sites/test_jinja/content/favicon.ico rename to tests/sites/test_jinja/content/favicon.ico diff --git a/hyde/tests/sites/test_jinja/content/media/css/site.css b/tests/sites/test_jinja/content/media/css/site.css similarity index 100% rename from hyde/tests/sites/test_jinja/content/media/css/site.css rename to tests/sites/test_jinja/content/media/css/site.css diff --git a/hyde/tests/sites/test_jinja/content/robots.txt b/tests/sites/test_jinja/content/robots.txt similarity index 100% rename from hyde/tests/sites/test_jinja/content/robots.txt rename to tests/sites/test_jinja/content/robots.txt diff --git a/hyde/tests/sites/test_jinja/info.yaml b/tests/sites/test_jinja/info.yaml similarity index 100% rename from hyde/tests/sites/test_jinja/info.yaml rename to tests/sites/test_jinja/info.yaml diff --git a/hyde/tests/sites/test_jinja/layout/base.html b/tests/sites/test_jinja/layout/base.html similarity index 100% rename from hyde/tests/sites/test_jinja/layout/base.html rename to tests/sites/test_jinja/layout/base.html diff --git a/hyde/tests/sites/test_jinja/layout/blog/post.html b/tests/sites/test_jinja/layout/blog/post.html similarity index 100% rename from hyde/tests/sites/test_jinja/layout/blog/post.html rename to tests/sites/test_jinja/layout/blog/post.html diff --git a/hyde/tests/sites/test_jinja/layout/root.html b/tests/sites/test_jinja/layout/root.html similarity index 100% rename from hyde/tests/sites/test_jinja/layout/root.html rename to tests/sites/test_jinja/layout/root.html diff --git a/hyde/tests/sites/test_jinja/site.yaml b/tests/sites/test_jinja/site.yaml similarity index 100% rename from hyde/tests/sites/test_jinja/site.yaml rename to tests/sites/test_jinja/site.yaml diff --git a/hyde/tests/sites/test_paginator/content/blog/angry-post.html b/tests/sites/test_paginator/content/blog/angry-post.html similarity index 100% rename from hyde/tests/sites/test_paginator/content/blog/angry-post.html rename to tests/sites/test_paginator/content/blog/angry-post.html diff --git a/hyde/tests/sites/test_paginator/content/blog/another-sad-post.html b/tests/sites/test_paginator/content/blog/another-sad-post.html similarity index 100% rename from hyde/tests/sites/test_paginator/content/blog/another-sad-post.html rename to tests/sites/test_paginator/content/blog/another-sad-post.html diff --git a/hyde/tests/sites/test_paginator/content/blog/happy-post.html b/tests/sites/test_paginator/content/blog/happy-post.html similarity index 100% rename from hyde/tests/sites/test_paginator/content/blog/happy-post.html rename to tests/sites/test_paginator/content/blog/happy-post.html diff --git a/hyde/tests/sites/test_paginator/content/blog/sad-post.html b/tests/sites/test_paginator/content/blog/sad-post.html similarity index 100% rename from hyde/tests/sites/test_paginator/content/blog/sad-post.html rename to tests/sites/test_paginator/content/blog/sad-post.html diff --git a/hyde/tests/sites/test_paginator/content/custom_file_pattern.txt b/tests/sites/test_paginator/content/custom_file_pattern.txt similarity index 100% rename from hyde/tests/sites/test_paginator/content/custom_file_pattern.txt rename to tests/sites/test_paginator/content/custom_file_pattern.txt diff --git a/hyde/tests/sites/test_paginator/content/empty.txt b/tests/sites/test_paginator/content/empty.txt similarity index 100% rename from hyde/tests/sites/test_paginator/content/empty.txt rename to tests/sites/test_paginator/content/empty.txt diff --git a/hyde/tests/sites/test_paginator/content/pages_of_one.txt b/tests/sites/test_paginator/content/pages_of_one.txt similarity index 100% rename from hyde/tests/sites/test_paginator/content/pages_of_one.txt rename to tests/sites/test_paginator/content/pages_of_one.txt diff --git a/hyde/tests/sites/test_paginator/content/pages_of_ten.txt b/tests/sites/test_paginator/content/pages_of_ten.txt similarity index 100% rename from hyde/tests/sites/test_paginator/content/pages_of_ten.txt rename to tests/sites/test_paginator/content/pages_of_ten.txt diff --git a/hyde/tests/sites/test_paginator/layout/root.j2 b/tests/sites/test_paginator/layout/root.j2 similarity index 100% rename from hyde/tests/sites/test_paginator/layout/root.j2 rename to tests/sites/test_paginator/layout/root.j2 diff --git a/hyde/tests/sites/test_paginator/site.yaml b/tests/sites/test_paginator/site.yaml similarity index 100% rename from hyde/tests/sites/test_paginator/site.yaml rename to tests/sites/test_paginator/site.yaml diff --git a/hyde/tests/sites/test_sorter/content/404.html b/tests/sites/test_sorter/content/404.html similarity index 100% rename from hyde/tests/sites/test_sorter/content/404.html rename to tests/sites/test_sorter/content/404.html diff --git a/hyde/tests/sites/test_sorter/content/about.html b/tests/sites/test_sorter/content/about.html similarity index 100% rename from hyde/tests/sites/test_sorter/content/about.html rename to tests/sites/test_sorter/content/about.html diff --git a/hyde/tests/sites/test_sorter/content/apple-touch-icon.png b/tests/sites/test_sorter/content/apple-touch-icon.png similarity index 100% rename from hyde/tests/sites/test_sorter/content/apple-touch-icon.png rename to tests/sites/test_sorter/content/apple-touch-icon.png diff --git a/hyde/tests/sites/test_sorter/content/blog/2010/december/merry-christmas.html b/tests/sites/test_sorter/content/blog/2010/december/merry-christmas.html similarity index 100% rename from hyde/tests/sites/test_sorter/content/blog/2010/december/merry-christmas.html rename to tests/sites/test_sorter/content/blog/2010/december/merry-christmas.html diff --git a/hyde/tests/sites/test_sorter/content/blog/angry-post.html b/tests/sites/test_sorter/content/blog/angry-post.html similarity index 100% rename from hyde/tests/sites/test_sorter/content/blog/angry-post.html rename to tests/sites/test_sorter/content/blog/angry-post.html diff --git a/hyde/tests/sites/test_sorter/content/blog/another-sad-post.html b/tests/sites/test_sorter/content/blog/another-sad-post.html similarity index 100% rename from hyde/tests/sites/test_sorter/content/blog/another-sad-post.html rename to tests/sites/test_sorter/content/blog/another-sad-post.html diff --git a/hyde/tests/sites/test_sorter/content/blog/happy-post.html b/tests/sites/test_sorter/content/blog/happy-post.html similarity index 100% rename from hyde/tests/sites/test_sorter/content/blog/happy-post.html rename to tests/sites/test_sorter/content/blog/happy-post.html diff --git a/hyde/tests/sites/test_sorter/content/blog/sad-post.html b/tests/sites/test_sorter/content/blog/sad-post.html similarity index 100% rename from hyde/tests/sites/test_sorter/content/blog/sad-post.html rename to tests/sites/test_sorter/content/blog/sad-post.html diff --git a/hyde/tests/sites/test_sorter/content/crossdomain.xml b/tests/sites/test_sorter/content/crossdomain.xml similarity index 100% rename from hyde/tests/sites/test_sorter/content/crossdomain.xml rename to tests/sites/test_sorter/content/crossdomain.xml diff --git a/hyde/tests/sites/test_sorter/content/favicon.ico b/tests/sites/test_sorter/content/favicon.ico similarity index 100% rename from hyde/tests/sites/test_sorter/content/favicon.ico rename to tests/sites/test_sorter/content/favicon.ico diff --git a/hyde/tests/sites/test_sorter/content/media/css/site.css b/tests/sites/test_sorter/content/media/css/site.css similarity index 100% rename from hyde/tests/sites/test_sorter/content/media/css/site.css rename to tests/sites/test_sorter/content/media/css/site.css diff --git a/hyde/tests/sites/test_sorter/content/robots.txt b/tests/sites/test_sorter/content/robots.txt similarity index 100% rename from hyde/tests/sites/test_sorter/content/robots.txt rename to tests/sites/test_sorter/content/robots.txt diff --git a/hyde/tests/sites/test_sorter/layout/root.j2 b/tests/sites/test_sorter/layout/root.j2 similarity index 100% rename from hyde/tests/sites/test_sorter/layout/root.j2 rename to tests/sites/test_sorter/layout/root.j2 diff --git a/hyde/tests/sites/test_sorter/layout/tagged_posts.j2 b/tests/sites/test_sorter/layout/tagged_posts.j2 similarity index 100% rename from hyde/tests/sites/test_sorter/layout/tagged_posts.j2 rename to tests/sites/test_sorter/layout/tagged_posts.j2 diff --git a/hyde/tests/sites/test_sorter/site.yaml b/tests/sites/test_sorter/site.yaml similarity index 100% rename from hyde/tests/sites/test_sorter/site.yaml rename to tests/sites/test_sorter/site.yaml diff --git a/hyde/tests/sites/test_tagger/content/blog/angry-post.html b/tests/sites/test_tagger/content/blog/angry-post.html similarity index 100% rename from hyde/tests/sites/test_tagger/content/blog/angry-post.html rename to tests/sites/test_tagger/content/blog/angry-post.html diff --git a/hyde/tests/sites/test_tagger/content/blog/another-sad-post.html b/tests/sites/test_tagger/content/blog/another-sad-post.html similarity index 100% rename from hyde/tests/sites/test_tagger/content/blog/another-sad-post.html rename to tests/sites/test_tagger/content/blog/another-sad-post.html diff --git a/hyde/tests/sites/test_tagger/content/blog/happy-post.html b/tests/sites/test_tagger/content/blog/happy-post.html similarity index 100% rename from hyde/tests/sites/test_tagger/content/blog/happy-post.html rename to tests/sites/test_tagger/content/blog/happy-post.html diff --git a/hyde/tests/sites/test_tagger/content/blog/sad-post.html b/tests/sites/test_tagger/content/blog/sad-post.html similarity index 100% rename from hyde/tests/sites/test_tagger/content/blog/sad-post.html rename to tests/sites/test_tagger/content/blog/sad-post.html diff --git a/hyde/tests/sites/test_tagger/layout/root.j2 b/tests/sites/test_tagger/layout/root.j2 similarity index 100% rename from hyde/tests/sites/test_tagger/layout/root.j2 rename to tests/sites/test_tagger/layout/root.j2 diff --git a/hyde/tests/sites/test_tagger/layout/tagged_posts.j2 b/tests/sites/test_tagger/layout/tagged_posts.j2 similarity index 100% rename from hyde/tests/sites/test_tagger/layout/tagged_posts.j2 rename to tests/sites/test_tagger/layout/tagged_posts.j2 diff --git a/hyde/tests/sites/test_tagger/site.yaml b/tests/sites/test_tagger/site.yaml similarity index 100% rename from hyde/tests/sites/test_tagger/site.yaml rename to tests/sites/test_tagger/site.yaml diff --git a/hyde/tests/ssp/ext/__init__.py b/tests/ssp/ext/__init__.py similarity index 100% rename from hyde/tests/ssp/ext/__init__.py rename to tests/ssp/ext/__init__.py diff --git a/hyde/tests/ssp/ext/banner.py b/tests/ssp/ext/banner.py similarity index 100% rename from hyde/tests/ssp/ext/banner.py rename to tests/ssp/ext/banner.py diff --git a/hyde/tests/ssp/site.yaml b/tests/ssp/site.yaml similarity index 100% rename from hyde/tests/ssp/site.yaml rename to tests/ssp/site.yaml diff --git a/hyde/tests/templates/jinja2/helpers.html b/tests/templates/jinja2/helpers.html similarity index 100% rename from hyde/tests/templates/jinja2/helpers.html rename to tests/templates/jinja2/helpers.html diff --git a/hyde/tests/templates/jinja2/index.html b/tests/templates/jinja2/index.html similarity index 100% rename from hyde/tests/templates/jinja2/index.html rename to tests/templates/jinja2/index.html diff --git a/hyde/tests/templates/jinja2/index_expected.html b/tests/templates/jinja2/index_expected.html similarity index 100% rename from hyde/tests/templates/jinja2/index_expected.html rename to tests/templates/jinja2/index_expected.html diff --git a/hyde/tests/templates/jinja2/layout.html b/tests/templates/jinja2/layout.html similarity index 100% rename from hyde/tests/templates/jinja2/layout.html rename to tests/templates/jinja2/layout.html diff --git a/hyde/tests/test_generate.py b/tests/test_generate.py similarity index 100% rename from hyde/tests/test_generate.py rename to tests/test_generate.py diff --git a/hyde/tests/test_initialize.py b/tests/test_initialize.py similarity index 100% rename from hyde/tests/test_initialize.py rename to tests/test_initialize.py diff --git a/hyde/tests/test_jinja2template.py b/tests/test_jinja2template.py similarity index 100% rename from hyde/tests/test_jinja2template.py rename to tests/test_jinja2template.py diff --git a/hyde/tests/test_layout.py b/tests/test_layout.py similarity index 100% rename from hyde/tests/test_layout.py rename to tests/test_layout.py diff --git a/hyde/tests/test_model.py b/tests/test_model.py similarity index 100% rename from hyde/tests/test_model.py rename to tests/test_model.py diff --git a/hyde/tests/test_plugin.py b/tests/test_plugin.py similarity index 97% rename from hyde/tests/test_plugin.py rename to tests/test_plugin.py index 9517b0d..f21e919 100644 --- a/hyde/tests/test_plugin.py +++ b/tests/test_plugin.py @@ -68,7 +68,7 @@ class TestPlugins(object): def setUp(self): self.site = Site(TEST_SITE) - self.site.config.plugins = ['hyde.tests.test_plugin.PluginLoaderStub'] + self.site.config.plugins = ['tests.test_plugin.PluginLoaderStub'] def test_can_load_plugin_modules(self): assert not len(self.site.plugins) @@ -354,8 +354,8 @@ class TestPlugins(object): def test_plugin_chaining(self): self.site.config.plugins = [ - 'hyde.tests.test_plugin.ConstantReturnPlugin', - 'hyde.tests.test_plugin.NoReturnPlugin' + 'tests.test_plugin.ConstantReturnPlugin', + 'tests.test_plugin.NoReturnPlugin' ] path = self.site.content.source_folder.child('about.html') gen = Generator(self.site) @@ -372,8 +372,8 @@ class TestPlugins(object): with patch.object(NoReturnPlugin, 'begin_text_resource', new=Mock(wraps=empty_return)) as mock2: self.site.config.plugins = [ - 'hyde.tests.test_plugin.ConstantReturnPlugin', - 'hyde.tests.test_plugin.NoReturnPlugin' + 'tests.test_plugin.ConstantReturnPlugin', + 'tests.test_plugin.NoReturnPlugin' ] self.site.config.constantreturn = Expando( dict(include_file_pattern="*.css")) @@ -400,8 +400,8 @@ class TestPlugins(object): with patch.object(NoReturnPlugin, 'begin_text_resource', new=Mock(wraps=empty_return)) as mock2: self.site.config.plugins = [ - 'hyde.tests.test_plugin.ConstantReturnPlugin', - 'hyde.tests.test_plugin.NoReturnPlugin' + 'tests.test_plugin.ConstantReturnPlugin', + 'tests.test_plugin.NoReturnPlugin' ] self.site.config.constantreturn = Expando( dict(include_paths="media")) diff --git a/hyde/tests/test_simple_copy.py b/tests/test_simple_copy.py similarity index 100% rename from hyde/tests/test_simple_copy.py rename to tests/test_simple_copy.py diff --git a/hyde/tests/test_site.py b/tests/test_site.py similarity index 100% rename from hyde/tests/test_site.py rename to tests/test_site.py diff --git a/hyde/tests/util.py b/tests/util.py similarity index 100% rename from hyde/tests/util.py rename to tests/util.py