- use an environment variable and venv. See https://github.com/Pylons/pyramid/pull/2468#discussion_r59311019

- rename stanza from `testing_extras` to `tests_require`
- switch from nose to pytest

8 files changed, 15 insertions, 15 deletions

diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index f5f291112..4805497d4 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -233,7 +233,7 @@ Install testing requirements
 ----------------------------
 
 In order to run tests, we need to install the testing requirements. This is
-done through our project's ``setup.py`` file, in the ``testing_extras`` and
+done through our project's ``setup.py`` file, in the ``tests_require`` and
 ``extras_require`` stanzas, and by issuing the command below for your
 operating system.
 
diff --git a/docs/tutorials/wiki2/src/authentication/setup.py b/docs/tutorials/wiki2/src/authentication/setup.py
index 8dca906c8..def3ce1f6 100644
--- a/docs/tutorials/wiki2/src/authentication/setup.py
+++ b/docs/tutorials/wiki2/src/authentication/setup.py
@@ -21,7 +21,7 @@ requires = [
     'waitress',
     ]
 
-testing_extras = [
+tests_require = [
     'WebTest >= 1.3.1',  # py3 compat
     'pytest',  # includes virtualenv
     'pytest-cov',
@@ -45,7 +45,7 @@ setup(name='tutorial',
       include_package_data=True,
       zip_safe=False,
       extras_require={
-          'testing': testing_extras,
+          'testing': tests_require,
       },
       install_requires=requires,
       entry_points="""\
diff --git a/docs/tutorials/wiki2/src/authorization/setup.py b/docs/tutorials/wiki2/src/authorization/setup.py
index 8dca906c8..def3ce1f6 100644
--- a/docs/tutorials/wiki2/src/authorization/setup.py
+++ b/docs/tutorials/wiki2/src/authorization/setup.py
@@ -21,7 +21,7 @@ requires = [
     'waitress',
     ]
 
-testing_extras = [
+tests_require = [
     'WebTest >= 1.3.1',  # py3 compat
     'pytest',  # includes virtualenv
     'pytest-cov',
@@ -45,7 +45,7 @@ setup(name='tutorial',
       include_package_data=True,
       zip_safe=False,
       extras_require={
-          'testing': testing_extras,
+          'testing': tests_require,
       },
       install_requires=requires,
       entry_points="""\
diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.py b/docs/tutorials/wiki2/src/basiclayout/setup.py
index c82c880c9..ede0a82ef 100644
--- a/docs/tutorials/wiki2/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki2/src/basiclayout/setup.py
@@ -19,7 +19,7 @@ requires = [
     'waitress',
     ]
 
-testing_extras = [
+tests_require = [
     'WebTest >= 1.3.1',  # py3 compat
     'pytest',  # includes virtualenv
     'pytest-cov',
@@ -43,7 +43,7 @@ setup(name='tutorial',
       include_package_data=True,
       zip_safe=False,
       extras_require={
-          'testing': testing_extras,
+          'testing': tests_require,
       },
       install_requires=requires,
       entry_points="""\
diff --git a/docs/tutorials/wiki2/src/installation/setup.py b/docs/tutorials/wiki2/src/installation/setup.py
index c82c880c9..ede0a82ef 100644
--- a/docs/tutorials/wiki2/src/installation/setup.py
+++ b/docs/tutorials/wiki2/src/installation/setup.py
@@ -19,7 +19,7 @@ requires = [
     'waitress',
     ]
 
-testing_extras = [
+tests_require = [
     'WebTest >= 1.3.1',  # py3 compat
     'pytest',  # includes virtualenv
     'pytest-cov',
@@ -43,7 +43,7 @@ setup(name='tutorial',
       include_package_data=True,
       zip_safe=False,
       extras_require={
-          'testing': testing_extras,
+          'testing': tests_require,
       },
       install_requires=requires,
       entry_points="""\
diff --git a/docs/tutorials/wiki2/src/models/setup.py b/docs/tutorials/wiki2/src/models/setup.py
index 9b73edb01..742a7c59c 100644
--- a/docs/tutorials/wiki2/src/models/setup.py
+++ b/docs/tutorials/wiki2/src/models/setup.py
@@ -20,7 +20,7 @@ requires = [
     'waitress',
     ]
 
-testing_extras = [
+tests_require = [
     'WebTest >= 1.3.1',  # py3 compat
     'pytest',  # includes virtualenv
     'pytest-cov',
@@ -44,7 +44,7 @@ setup(name='tutorial',
       include_package_data=True,
       zip_safe=False,
       extras_require={
-          'testing': testing_extras,
+          'testing': tests_require,
       },
       install_requires=requires,
       entry_points="""\
diff --git a/docs/tutorials/wiki2/src/tests/setup.py b/docs/tutorials/wiki2/src/tests/setup.py
index 8dca906c8..def3ce1f6 100644
--- a/docs/tutorials/wiki2/src/tests/setup.py
+++ b/docs/tutorials/wiki2/src/tests/setup.py
@@ -21,7 +21,7 @@ requires = [
     'waitress',
     ]
 
-testing_extras = [
+tests_require = [
     'WebTest >= 1.3.1',  # py3 compat
     'pytest',  # includes virtualenv
     'pytest-cov',
@@ -45,7 +45,7 @@ setup(name='tutorial',
       include_package_data=True,
       zip_safe=False,
       extras_require={
-          'testing': testing_extras,
+          'testing': tests_require,
       },
       install_requires=requires,
       entry_points="""\
diff --git a/docs/tutorials/wiki2/src/views/setup.py b/docs/tutorials/wiki2/src/views/setup.py
index 8dca906c8..def3ce1f6 100644
--- a/docs/tutorials/wiki2/src/views/setup.py
+++ b/docs/tutorials/wiki2/src/views/setup.py
@@ -21,7 +21,7 @@ requires = [
     'waitress',
     ]
 
-testing_extras = [
+tests_require = [
     'WebTest >= 1.3.1',  # py3 compat
     'pytest',  # includes virtualenv
     'pytest-cov',
@@ -45,7 +45,7 @@ setup(name='tutorial',
       include_package_data=True,
       zip_safe=False,
       extras_require={
-          'testing': testing_extras,
+          'testing': tests_require,
       },
       install_requires=requires,
       entry_points="""\