From 75c30dfe18b26ca04efae2acbe35052fa0d93ed6 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Sun, 18 Jun 2017 08:46:27 +0200
Subject: [PATCH] Merge branch 'master' into pr/3034
---
docs/quick_tour.rst | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 571dfb3..5679b0d 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -46,7 +46,7 @@
# set an environment variable to where you want your virtual environment
c:\\> set VENV=c:\\env
# create the virtual environment
- c:\\> %VENV%\\Scripts\\python -m venv %VENV%
+ c:\\> python -m venv %VENV%
# install pyramid
c:\\> %VENV%\\Scripts\\pip install pyramid
# or for a specific released version
@@ -510,7 +510,7 @@
.. code-block:: bash
- $ $VENV/bin/cookiecutter https://github.com/Pylons/pyramid-cookiecutter-starter
+ $ $VENV/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout 1.9-branch
If prompted for the first item, accept the default ``yes`` by hitting return.
@@ -618,7 +618,7 @@
#. *Choice of web server:* ``use = egg:waitress#main`` tells ``pserve`` to
use the ``waitress`` server.
-#. *Interfaces:* ``listen = 127.0.0.1:6543 [::1]:6543`` tells ``waitress`` to listen on all interfaces on port 6543 for both IPv4 and IPv6.
+#. *Interfaces:* ``listen = localhost:6543`` tells ``waitress`` to listen on all interfaces on port 6543 for both IPv4 and IPv6.
Additionally the ``development.ini`` generated by this cookiecutter wired up
Python's standard logging. We'll now see in the console, for example, a log on
@@ -647,8 +647,8 @@
.. literalinclude:: quick_tour/package/setup.py
:language: python
:lineno-match:
- :lines: 11-16
- :emphasize-lines: 4
+ :lines: 11-17
+ :emphasize-lines: 5
It was installed when you previously ran:
@@ -657,14 +657,7 @@
$ $VENV/bin/pip install -e ".[testing]"
The ``pyramid_debugtoolbar`` package is a Pyramid add-on, which means we need
-to include its configuration into our web application. The cookiecutter already took care of this for us in its ``__init__.py``:
-
-.. literalinclude:: quick_tour/package/hello_world/__init__.py
- :language: python
- :lineno-match:
- :lines: 8
-
-And it uses the ``pyramid.includes`` facility in our ``development.ini``:
+to include its configuration into our web application. The cookiecutter already took care of this for us in its ``development.ini`` using the ``pyramid.includes`` facility:
.. literalinclude:: quick_tour/package/development.ini
:language: ini
@@ -692,18 +685,17 @@
Our ``pyramid-cookiecutter-starter`` cookiecutter generated a ``tests.py`` module with
one unit test and one functional test in it. It also configured ``setup.py`` with test requirements:
``py.test`` as the test runner, ``WebTest`` for running view tests, and the
-``pytest-cov`` tool which yells at us for code that isn't tested. The
-highlighted lines show this:
+``pytest-cov`` tool which yells at us for code that isn't tested:
.. literalinclude:: quick_tour/package/setup.py
:language: python
:lineno-match:
- :lines: 18-22
+ :lines: 19-23
.. literalinclude:: quick_tour/package/setup.py
:language: python
:lineno-match:
- :lines: 42-44
+ :lines: 43-45
We already installed the test requirements when we ran the command ``$VENV/bin/pip install -e ".[testing]"``. We can now run all our tests:
@@ -866,7 +858,7 @@
.. code-block:: bash
$ cd ~
- $ env/bin/cookiecutter https://github.com/Pylons/pyramid-cookiecutter-alchemy
+ $ env/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-alchemy --checkout 1.9-branch
If prompted for the first item, accept the default ``yes`` by hitting return.
--
Gitblit v1.9.3