Merge branch '0.11-maintenance'

examples/flaskr/README

@@ -19,7 +19,7 @@
 
       3. Instruct flask to use the right application
 
-         export FLASK_APP=flaskr.flaskr
+         export FLASK_APP=flaskr
 
       4. initialize the database with this command:
 

examples/flaskr/flaskr/__init__.py

@@ -0,0 +1 @@
+from flaskr import app

examples/flaskr/tests/context.py

@@ -1,6 +0,0 @@
-import sys, os
-
-basedir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, basedir + '/../')
-
-from flaskr import flaskr

examples/flaskr/tests/test_flaskr.py

@@ -9,11 +9,11 @@
     :license: BSD, see LICENSE for more details.
 """
 
-import pytest
 import os
 import tempfile
+import pytest
+from flaskr import flaskr
 
-from context import flaskr
 
 @pytest.fixture
 def client(request):

examples/minitwit/.gitignore

@@ -0,0 +1,2 @@
+minitwit.db
+.eggs/

examples/minitwit/MANIFEST.in

@@ -0,0 +1,3 @@
+graft minitwit/templates
+graft minitwit/static
+include minitwit/schema.sql

examples/minitwit/README

@@ -31,5 +31,5 @@
 
     ~ Is it tested?
 
-      You betcha.  Run the `test_minitwit.py` file to
+      You betcha.  Run the `python setup.py test` file to
       see the tests pass.

examples/minitwit/minitwit/__init__.py

@@ -0,0 +1 @@
+from minitwit import app

examples/minitwit/setup.cfg

@@ -0,0 +1,2 @@
+[aliases]
+test=pytest

examples/minitwit/setup.py

@@ -0,0 +1,16 @@
+from setuptools import setup
+
+setup(
+    name='minitwit',
+    packages=['minitwit'],
+    include_package_data=True,
+    install_requires=[
+        'flask',
+    ],
+    setup_requires=[
+        'pytest-runner',
+    ],
+    tests_require=[
+        'pytest',
+    ],
+)

examples/minitwit/tests/test_minitwit.py

@@ -9,9 +9,9 @@
     :license: BSD, see LICENSE for more details.
 """
 import os
-import minitwit
 import tempfile
 import pytest
+from minitwit import minitwit
 
 
 @pytest.fixture