Merge branch 'master' into issue.2614

1 files changed, 34 insertions, 27 deletions

diff --git a/docs/quick_tour/package/setup.py b/docs/quick_tour/package/setup.py
index 61ed3c406..e32aecacd 100644
--- a/docs/quick_tour/package/setup.py
+++ b/docs/quick_tour/package/setup.py
@@ -15,30 +15,37 @@ requires = [
     'waitress',
 ]
 
-setup(name='hello_world',
-      version='0.0',
-      description='hello_world',
-      long_description=README + '\n\n' + CHANGES,
-      classifiers=[
-          "Programming Language :: Python",
-          "Framework :: Pyramid",
-          "Topic :: Internet :: WWW/HTTP",
-          "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
-      ],
-      author='',
-      author_email='',
-      url='',
-      keywords='web pyramid pylons',
-      packages=find_packages(),
-      include_package_data=True,
-      zip_safe=False,
-      install_requires=requires,
-      tests_require={
-          'testing': ['nose', 'coverage'],
-      },
-      test_suite="hello_world",
-      entry_points="""\
-      [paste.app_factory]
-      main = hello_world:main
-      """,
-      )
+tests_require = [
+    'WebTest >= 1.3.1',  # py3 compat
+    'pytest',
+    'pytest-cov',
+]
+
+setup(
+    name='hello_world',
+    version='0.0',
+    description='hello_world',
+    long_description=README + '\n\n' + CHANGES,
+    classifiers=[
+        'Programming Language :: Python',
+        'Framework :: Pyramid',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
+    ],
+    author='',
+    author_email='',
+    url='',
+    keywords='web pyramid pylons',
+    packages=find_packages(),
+    include_package_data=True,
+    zip_safe=False,
+    extras_require={
+        'testing': tests_require,
+    },
+    install_requires=requires,
+    entry_points={
+        'paste.app_factory': [
+            'main = hello_world:main',
+        ],
+    },
+)