diff --git a/MANIFEST.in b/MANIFEST.in index f82ed054..3fef8b5b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -include Makefile CHANGES LICENSE AUTHORS run-tests.py +include Makefile CHANGES LICENSE AUTHORS recursive-include artwork * recursive-include tests * recursive-include examples * @@ -9,8 +9,5 @@ recursive-exclude tests *.pyc recursive-exclude tests *.pyo recursive-exclude examples *.pyc recursive-exclude examples *.pyo -recursive-include flask/testsuite/static * -recursive-include flask/testsuite/templates * -recursive-include flask/testsuite/test_apps * prune docs/_build prune docs/_themes/.git diff --git a/flask/testsuite/test_apps/lib/python2.5/site-packages/SiteEgg.egg b/flask/testsuite/test_apps/lib/python2.5/site-packages/SiteEgg.egg deleted file mode 100644 index d80abe93..00000000 Binary files a/flask/testsuite/test_apps/lib/python2.5/site-packages/SiteEgg.egg and /dev/null differ diff --git a/setup.py b/setup.py index 3500ad8c..a66118f1 100644 --- a/setup.py +++ b/setup.py @@ -117,6 +117,5 @@ setup( [console_scripts] flask=flask.cli:main ''', - cmdclass={'audit': run_audit}, - test_suite='flask.testsuite.suite' + cmdclass={'audit': run_audit} ) diff --git a/flask/testsuite/__init__.py b/tests/__init__.py similarity index 100% rename from flask/testsuite/__init__.py rename to tests/__init__.py diff --git a/flask/testsuite/appctx.py b/tests/appctx.py similarity index 100% rename from flask/testsuite/appctx.py rename to tests/appctx.py diff --git a/flask/testsuite/basic.py b/tests/basic.py similarity index 100% rename from flask/testsuite/basic.py rename to tests/basic.py diff --git a/flask/testsuite/blueprints.py b/tests/blueprints.py similarity index 100% rename from flask/testsuite/blueprints.py rename to tests/blueprints.py diff --git a/flask/testsuite/config.py b/tests/config.py similarity index 100% rename from flask/testsuite/config.py rename to tests/config.py diff --git a/flask/testsuite/deprecations.py b/tests/deprecations.py similarity index 100% rename from flask/testsuite/deprecations.py rename to tests/deprecations.py diff --git a/flask/testsuite/examples.py b/tests/examples.py similarity index 100% rename from flask/testsuite/examples.py rename to tests/examples.py diff --git a/flask/testsuite/ext.py b/tests/ext.py similarity index 100% rename from flask/testsuite/ext.py rename to tests/ext.py diff --git a/flask/testsuite/helpers.py b/tests/helpers.py similarity index 100% rename from flask/testsuite/helpers.py rename to tests/helpers.py diff --git a/flask/testsuite/regression.py b/tests/regression.py similarity index 100% rename from flask/testsuite/regression.py rename to tests/regression.py diff --git a/flask/testsuite/reqctx.py b/tests/reqctx.py similarity index 100% rename from flask/testsuite/reqctx.py rename to tests/reqctx.py diff --git a/flask/testsuite/signals.py b/tests/signals.py similarity index 100% rename from flask/testsuite/signals.py rename to tests/signals.py diff --git a/flask/testsuite/static/config.json b/tests/static/config.json similarity index 100% rename from flask/testsuite/static/config.json rename to tests/static/config.json diff --git a/flask/testsuite/static/index.html b/tests/static/index.html similarity index 100% rename from flask/testsuite/static/index.html rename to tests/static/index.html diff --git a/flask/testsuite/subclassing.py b/tests/subclassing.py similarity index 100% rename from flask/testsuite/subclassing.py rename to tests/subclassing.py diff --git a/flask/testsuite/templates/_macro.html b/tests/templates/_macro.html similarity index 100% rename from flask/testsuite/templates/_macro.html rename to tests/templates/_macro.html diff --git a/flask/testsuite/templates/context_template.html b/tests/templates/context_template.html similarity index 100% rename from flask/testsuite/templates/context_template.html rename to tests/templates/context_template.html diff --git a/flask/testsuite/templates/escaping_template.html b/tests/templates/escaping_template.html similarity index 100% rename from flask/testsuite/templates/escaping_template.html rename to tests/templates/escaping_template.html diff --git a/flask/testsuite/templates/mail.txt b/tests/templates/mail.txt similarity index 100% rename from flask/testsuite/templates/mail.txt rename to tests/templates/mail.txt diff --git a/flask/testsuite/templates/nested/nested.txt b/tests/templates/nested/nested.txt similarity index 100% rename from flask/testsuite/templates/nested/nested.txt rename to tests/templates/nested/nested.txt diff --git a/flask/testsuite/templates/simple_template.html b/tests/templates/simple_template.html similarity index 100% rename from flask/testsuite/templates/simple_template.html rename to tests/templates/simple_template.html diff --git a/flask/testsuite/templates/template_filter.html b/tests/templates/template_filter.html similarity index 100% rename from flask/testsuite/templates/template_filter.html rename to tests/templates/template_filter.html diff --git a/flask/testsuite/templates/template_test.html b/tests/templates/template_test.html similarity index 100% rename from flask/testsuite/templates/template_test.html rename to tests/templates/template_test.html diff --git a/flask/testsuite/templating.py b/tests/templating.py similarity index 100% rename from flask/testsuite/templating.py rename to tests/templating.py diff --git a/flask/testsuite/test_apps/blueprintapp/__init__.py b/tests/test_apps/blueprintapp/__init__.py similarity index 100% rename from flask/testsuite/test_apps/blueprintapp/__init__.py rename to tests/test_apps/blueprintapp/__init__.py diff --git a/flask/testsuite/test_apps/blueprintapp/apps/__init__.py b/tests/test_apps/blueprintapp/apps/__init__.py similarity index 100% rename from flask/testsuite/test_apps/blueprintapp/apps/__init__.py rename to tests/test_apps/blueprintapp/apps/__init__.py diff --git a/flask/testsuite/test_apps/blueprintapp/apps/admin/__init__.py b/tests/test_apps/blueprintapp/apps/admin/__init__.py similarity index 100% rename from flask/testsuite/test_apps/blueprintapp/apps/admin/__init__.py rename to tests/test_apps/blueprintapp/apps/admin/__init__.py diff --git a/flask/testsuite/test_apps/blueprintapp/apps/admin/static/css/test.css b/tests/test_apps/blueprintapp/apps/admin/static/css/test.css similarity index 100% rename from flask/testsuite/test_apps/blueprintapp/apps/admin/static/css/test.css rename to tests/test_apps/blueprintapp/apps/admin/static/css/test.css diff --git a/flask/testsuite/test_apps/blueprintapp/apps/admin/static/test.txt b/tests/test_apps/blueprintapp/apps/admin/static/test.txt similarity index 100% rename from flask/testsuite/test_apps/blueprintapp/apps/admin/static/test.txt rename to tests/test_apps/blueprintapp/apps/admin/static/test.txt diff --git a/flask/testsuite/test_apps/blueprintapp/apps/admin/templates/admin/index.html b/tests/test_apps/blueprintapp/apps/admin/templates/admin/index.html similarity index 100% rename from flask/testsuite/test_apps/blueprintapp/apps/admin/templates/admin/index.html rename to tests/test_apps/blueprintapp/apps/admin/templates/admin/index.html diff --git a/flask/testsuite/test_apps/blueprintapp/apps/frontend/__init__.py b/tests/test_apps/blueprintapp/apps/frontend/__init__.py similarity index 100% rename from flask/testsuite/test_apps/blueprintapp/apps/frontend/__init__.py rename to tests/test_apps/blueprintapp/apps/frontend/__init__.py diff --git a/flask/testsuite/test_apps/blueprintapp/apps/frontend/templates/frontend/index.html b/tests/test_apps/blueprintapp/apps/frontend/templates/frontend/index.html similarity index 100% rename from flask/testsuite/test_apps/blueprintapp/apps/frontend/templates/frontend/index.html rename to tests/test_apps/blueprintapp/apps/frontend/templates/frontend/index.html diff --git a/flask/testsuite/test_apps/config_module_app.py b/tests/test_apps/config_module_app.py similarity index 100% rename from flask/testsuite/test_apps/config_module_app.py rename to tests/test_apps/config_module_app.py diff --git a/flask/testsuite/test_apps/config_package_app/__init__.py b/tests/test_apps/config_package_app/__init__.py similarity index 100% rename from flask/testsuite/test_apps/config_package_app/__init__.py rename to tests/test_apps/config_package_app/__init__.py diff --git a/flask/testsuite/test_apps/flask_broken/__init__.py b/tests/test_apps/flask_broken/__init__.py similarity index 100% rename from flask/testsuite/test_apps/flask_broken/__init__.py rename to tests/test_apps/flask_broken/__init__.py diff --git a/flask/testsuite/test_apps/flask_broken/b.py b/tests/test_apps/flask_broken/b.py similarity index 100% rename from flask/testsuite/test_apps/flask_broken/b.py rename to tests/test_apps/flask_broken/b.py diff --git a/flask/testsuite/test_apps/flask_newext_package/__init__.py b/tests/test_apps/flask_newext_package/__init__.py similarity index 100% rename from flask/testsuite/test_apps/flask_newext_package/__init__.py rename to tests/test_apps/flask_newext_package/__init__.py diff --git a/flask/testsuite/test_apps/flask_newext_package/submodule.py b/tests/test_apps/flask_newext_package/submodule.py similarity index 100% rename from flask/testsuite/test_apps/flask_newext_package/submodule.py rename to tests/test_apps/flask_newext_package/submodule.py diff --git a/flask/testsuite/test_apps/flask_newext_simple.py b/tests/test_apps/flask_newext_simple.py similarity index 100% rename from flask/testsuite/test_apps/flask_newext_simple.py rename to tests/test_apps/flask_newext_simple.py diff --git a/flask/testsuite/test_apps/flaskext/__init__.py b/tests/test_apps/flaskext/__init__.py similarity index 100% rename from flask/testsuite/test_apps/flaskext/__init__.py rename to tests/test_apps/flaskext/__init__.py diff --git a/flask/testsuite/test_apps/flaskext/oldext_package/__init__.py b/tests/test_apps/flaskext/oldext_package/__init__.py similarity index 100% rename from flask/testsuite/test_apps/flaskext/oldext_package/__init__.py rename to tests/test_apps/flaskext/oldext_package/__init__.py diff --git a/flask/testsuite/test_apps/flaskext/oldext_package/submodule.py b/tests/test_apps/flaskext/oldext_package/submodule.py similarity index 100% rename from flask/testsuite/test_apps/flaskext/oldext_package/submodule.py rename to tests/test_apps/flaskext/oldext_package/submodule.py diff --git a/flask/testsuite/test_apps/flaskext/oldext_simple.py b/tests/test_apps/flaskext/oldext_simple.py similarity index 100% rename from flask/testsuite/test_apps/flaskext/oldext_simple.py rename to tests/test_apps/flaskext/oldext_simple.py diff --git a/flask/testsuite/test_apps/importerror.py b/tests/test_apps/importerror.py similarity index 100% rename from flask/testsuite/test_apps/importerror.py rename to tests/test_apps/importerror.py diff --git a/flask/testsuite/test_apps/lib/python2.5/site-packages/site_app.py b/tests/test_apps/lib/python2.5/site-packages/site_app.py similarity index 100% rename from flask/testsuite/test_apps/lib/python2.5/site-packages/site_app.py rename to tests/test_apps/lib/python2.5/site-packages/site_app.py diff --git a/flask/testsuite/test_apps/lib/python2.5/site-packages/site_package/__init__.py b/tests/test_apps/lib/python2.5/site-packages/site_package/__init__.py similarity index 100% rename from flask/testsuite/test_apps/lib/python2.5/site-packages/site_package/__init__.py rename to tests/test_apps/lib/python2.5/site-packages/site_package/__init__.py diff --git a/flask/testsuite/test_apps/main_app.py b/tests/test_apps/main_app.py similarity index 100% rename from flask/testsuite/test_apps/main_app.py rename to tests/test_apps/main_app.py diff --git a/flask/testsuite/test_apps/path/installed_package/__init__.py b/tests/test_apps/path/installed_package/__init__.py similarity index 100% rename from flask/testsuite/test_apps/path/installed_package/__init__.py rename to tests/test_apps/path/installed_package/__init__.py diff --git a/flask/testsuite/test_apps/subdomaintestmodule/__init__.py b/tests/test_apps/subdomaintestmodule/__init__.py similarity index 100% rename from flask/testsuite/test_apps/subdomaintestmodule/__init__.py rename to tests/test_apps/subdomaintestmodule/__init__.py diff --git a/flask/testsuite/test_apps/subdomaintestmodule/static/hello.txt b/tests/test_apps/subdomaintestmodule/static/hello.txt similarity index 100% rename from flask/testsuite/test_apps/subdomaintestmodule/static/hello.txt rename to tests/test_apps/subdomaintestmodule/static/hello.txt diff --git a/flask/testsuite/testing.py b/tests/testing.py similarity index 100% rename from flask/testsuite/testing.py rename to tests/testing.py diff --git a/flask/testsuite/views.py b/tests/views.py similarity index 100% rename from flask/testsuite/views.py rename to tests/views.py