Merge pull request #2436 from stevepiercy/docs/easy-install-to-pip.2104

complete quick_tutorial

19 files changed, 29 insertions, 26 deletions

diff --git a/docs/quick_tutorial/authentication.rst b/docs/quick_tutorial/authentication.rst
index 7fd8173d4..cb3839b08 100644
--- a/docs/quick_tutorial/authentication.rst
+++ b/docs/quick_tutorial/authentication.rst
@@ -1,3 +1,5 @@
+.. _qtut_authentication:
+
 ==============================
 20: Logins With Authentication
 ==============================
@@ -33,7 +35,7 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r view_classes authentication; cd authentication
-    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/pip install -e .
 
 #. Put the security hash in the ``authentication/development.ini``
    configuration file as ``tutorial.secret`` instead of putting it in
diff --git a/docs/quick_tutorial/authorization.rst b/docs/quick_tutorial/authorization.rst
index 855043f7f..a4a12774b 100644
--- a/docs/quick_tutorial/authorization.rst
+++ b/docs/quick_tutorial/authorization.rst
@@ -1,3 +1,5 @@
+.. _qtut_authorization:
+
 ===========================================
 21: Protecting Resources With Authorization
 ===========================================
@@ -38,7 +40,7 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r authentication authorization; cd authorization
-    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/pip install -e .
 
 #. Start by changing ``authorization/tutorial/__init__.py`` to
    specify a root factory to the :term:`configurator`:
diff --git a/docs/quick_tutorial/databases.rst b/docs/quick_tutorial/databases.rst
index 19dfd066d..311ff6ec5 100644
--- a/docs/quick_tutorial/databases.rst
+++ b/docs/quick_tutorial/databases.rst
@@ -53,7 +53,7 @@ Steps
 
    .. note::
 
-     We aren't yet doing ``$VENV/bin/python setup.py develop`` as we
+     We aren't yet doing ``$VENV/bin/pip install -e .`` as we
      will change it later.
 
 #. Our configuration file at ``databases/development.ini`` wires
@@ -78,7 +78,7 @@ Steps
 
    .. code-block:: bash
 
-    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/pip install -e .
 
 #. The script references some models in ``databases/tutorial/models.py``:
 
diff --git a/docs/quick_tutorial/debugtoolbar.rst b/docs/quick_tutorial/debugtoolbar.rst
index f11abc493..1f89cd319 100644
--- a/docs/quick_tutorial/debugtoolbar.rst
+++ b/docs/quick_tutorial/debugtoolbar.rst
@@ -4,8 +4,7 @@
 04: Easier Development with ``debugtoolbar``
 ============================================
 
-Error-handling and introspection using the ``pyramid_debugtoolbar``
-add-on.
+Error handling and introspection using the ``pyramid_debugtoolbar`` add-on.
 
 Background
 ==========
@@ -36,8 +35,8 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r ini debugtoolbar; cd debugtoolbar
-    $ $VENV/bin/python setup.py develop
-    $ $VENV/bin/easy_install pyramid_debugtoolbar
+    $ $VENV/bin/pip install -e .
+    $ $VENV/bin/pip install pyramid_debugtoolbar
 
 #. Our ``debugtoolbar/development.ini`` gets a configuration entry for
    ``pyramid.includes``:
diff --git a/docs/quick_tutorial/forms.rst b/docs/quick_tutorial/forms.rst
index f81b88fc2..023e7127f 100644
--- a/docs/quick_tutorial/forms.rst
+++ b/docs/quick_tutorial/forms.rst
@@ -50,7 +50,7 @@ Steps
 
    .. code-block:: bash
 
-      $ $VENV/bin/python setup.py develop
+      $ $VENV/bin/pip install -e .
 
 #. Register a static view in ``forms/tutorial/__init__.py`` for
    Deform's CSS/JS etc. as well as our demo wikipage scenario's
diff --git a/docs/quick_tutorial/functional_testing.rst b/docs/quick_tutorial/functional_testing.rst
index 6f1544e79..b8aa7e87d 100644
--- a/docs/quick_tutorial/functional_testing.rst
+++ b/docs/quick_tutorial/functional_testing.rst
@@ -34,8 +34,8 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r unit_testing functional_testing; cd functional_testing
-    $ $VENV/bin/python setup.py develop
-    $ $VENV/bin/easy_install webtest
+    $ $VENV/bin/pip install -e .
+    $ $VENV/bin/pip install webtest
 
 #. Let's extend ``functional_testing/tutorial/tests.py`` to include a
    functional test:
diff --git a/docs/quick_tutorial/ini.rst b/docs/quick_tutorial/ini.rst
index 36942c767..0aed304df 100644
--- a/docs/quick_tutorial/ini.rst
+++ b/docs/quick_tutorial/ini.rst
@@ -50,7 +50,7 @@ Steps
 
    .. code-block:: bash
 
-    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/pip install -e .
 
 #. Let's make a file ``ini/development.ini`` for our configuration:
 
diff --git a/docs/quick_tutorial/jinja2.rst b/docs/quick_tutorial/jinja2.rst
index 2121803f9..6b9d5feba 100644
--- a/docs/quick_tutorial/jinja2.rst
+++ b/docs/quick_tutorial/jinja2.rst
@@ -26,8 +26,8 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r view_classes jinja2; cd jinja2
-    $ $VENV/bin/python setup.py develop
-    $ $VENV/bin/easy_install pyramid_jinja2
+    $ $VENV/bin/pip install -e .
+    $ $VENV/bin/pip install pyramid_jinja2
 
 #. We need to include ``pyramid_jinja2`` in
    ``jinja2/tutorial/__init__.py``:
diff --git a/docs/quick_tutorial/json.rst b/docs/quick_tutorial/json.rst
index aa789d833..49421829b 100644
--- a/docs/quick_tutorial/json.rst
+++ b/docs/quick_tutorial/json.rst
@@ -31,7 +31,7 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r view_classes json; cd json
-    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/pip install -e .
 
 #. We add a new route for ``hello_json`` in
    ``json/tutorial/__init__.py``:
diff --git a/docs/quick_tutorial/logging.rst b/docs/quick_tutorial/logging.rst
index 5d29cd196..556a09bf0 100644
--- a/docs/quick_tutorial/logging.rst
+++ b/docs/quick_tutorial/logging.rst
@@ -35,7 +35,7 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r view_classes logging; cd logging
-    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/pip install -e .
 
 #. Extend ``logging/tutorial/views.py`` to log a message:
 
diff --git a/docs/quick_tutorial/more_view_classes.rst b/docs/quick_tutorial/more_view_classes.rst
index afbb7cc3a..fb97cceb2 100644
--- a/docs/quick_tutorial/more_view_classes.rst
+++ b/docs/quick_tutorial/more_view_classes.rst
@@ -57,7 +57,7 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r templating more_view_classes; cd more_view_classes
-    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/pip install -e .
 
 #. Our route in ``more_view_classes/tutorial/__init__.py`` needs some
    replacement patterns:
diff --git a/docs/quick_tutorial/request_response.rst b/docs/quick_tutorial/request_response.rst
index 4f8de0221..f42423de8 100644
--- a/docs/quick_tutorial/request_response.rst
+++ b/docs/quick_tutorial/request_response.rst
@@ -41,7 +41,7 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r view_classes request_response; cd request_response
-    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/pip install -e .
 
 #. Simplify the routes in ``request_response/tutorial/__init__.py``:
 
diff --git a/docs/quick_tutorial/routing.rst b/docs/quick_tutorial/routing.rst
index 416a346fa..7b6d0904d 100644
--- a/docs/quick_tutorial/routing.rst
+++ b/docs/quick_tutorial/routing.rst
@@ -48,7 +48,7 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r view_classes routing; cd routing
-    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/pip install -e .
 
 #. Our ``routing/tutorial/__init__.py`` needs a route with a replacement
    pattern:
diff --git a/docs/quick_tutorial/sessions.rst b/docs/quick_tutorial/sessions.rst
index f97405500..06176f2b6 100644
--- a/docs/quick_tutorial/sessions.rst
+++ b/docs/quick_tutorial/sessions.rst
@@ -34,7 +34,7 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r view_classes sessions; cd sessions
-    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/pip install -e .
 
 #. Our ``sessions/tutorial/__init__.py`` needs a choice of session
    factory to get registered with the :term:`configurator`:
diff --git a/docs/quick_tutorial/static_assets.rst b/docs/quick_tutorial/static_assets.rst
index 3a7496ec7..61c5fbd50 100644
--- a/docs/quick_tutorial/static_assets.rst
+++ b/docs/quick_tutorial/static_assets.rst
@@ -23,7 +23,7 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r view_classes static_assets; cd static_assets
-    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/pip install -e .
 
 #. We add a call ``config.add_static_view`` in
    ``static_assets/tutorial/__init__.py``:
diff --git a/docs/quick_tutorial/templating.rst b/docs/quick_tutorial/templating.rst
index cf56d2a96..a975d9ec2 100644
--- a/docs/quick_tutorial/templating.rst
+++ b/docs/quick_tutorial/templating.rst
@@ -56,7 +56,7 @@ Steps
 
    .. code-block:: bash
 
-    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/pip install -e .
 
 #. We need to connect ``pyramid_chameleon`` as a renderer by making a
    call in the setup of ``templating/tutorial/__init__.py``:
diff --git a/docs/quick_tutorial/unit_testing.rst b/docs/quick_tutorial/unit_testing.rst
index 4cb7ef714..58512d1cc 100644
--- a/docs/quick_tutorial/unit_testing.rst
+++ b/docs/quick_tutorial/unit_testing.rst
@@ -48,8 +48,8 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r debugtoolbar unit_testing; cd unit_testing
-    $ $VENV/bin/python setup.py develop
-    $ $VENV/bin/easy_install nose
+    $ $VENV/bin/pip install -e .
+    $ $VENV/bin/pip install nose
 
 #. Now we write a simple unit test in ``unit_testing/tutorial/tests.py``:
 
diff --git a/docs/quick_tutorial/view_classes.rst b/docs/quick_tutorial/view_classes.rst
index 6198eed63..cc5337493 100644
--- a/docs/quick_tutorial/view_classes.rst
+++ b/docs/quick_tutorial/view_classes.rst
@@ -41,7 +41,7 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r templating view_classes; cd view_classes
-    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/pip install -e .
 
 #. Our ``view_classes/tutorial/views.py`` now has a view class with
    our two views:
diff --git a/docs/quick_tutorial/views.rst b/docs/quick_tutorial/views.rst
index 6728925fd..5b6e2960b 100644
--- a/docs/quick_tutorial/views.rst
+++ b/docs/quick_tutorial/views.rst
@@ -43,7 +43,7 @@ Steps
    .. code-block:: bash
 
     $ cd ..; cp -r functional_testing views; cd views
-    $ $VENV/bin/python setup.py develop
+    $ $VENV/bin/pip install -e .
 
 #. Our ``views/tutorial/__init__.py`` gets a lot shorter: