diff options
| -rw-r--r-- | docs/index.rst | 2 | ||||
| -rw-r--r-- | docs/narr/install.rst | 15 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/authorization/setup.py | 1 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/basiclayout/setup.py | 1 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/models/setup.py | 1 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/tests/setup.py | 1 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/views/setup.py | 1 | ||||
| -rw-r--r-- | docs/tutorials/wiki/tests.rst | 2 | ||||
| -rw-r--r-- | pyramid/config/views.py | 1 | ||||
| -rw-r--r-- | pyramid/scaffolds/zodb/setup.py_tmpl | 1 |
10 files changed, 23 insertions, 3 deletions
diff --git a/docs/index.rst b/docs/index.rst index faf8258c1..406cc9b03 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -200,7 +200,7 @@ To check out the trunk via ``git``, use this command: To find out how to become a contributor to :app:`Pyramid`, please see the `contributor's section of the documentation -<http://docs.pylonsproject.org/index.html#contributing>`_. +<http://docs.pylonsproject.org/en/latest/#contributing>`_. Index and Glossary ================== diff --git a/docs/narr/install.rst b/docs/narr/install.rst index e8482a289..882e76f11 100644 --- a/docs/narr/install.rst +++ b/docs/narr/install.rst @@ -243,6 +243,21 @@ Once you've got setuptools or distribute installed, you should install the :term:`virtualenv` package. To install the :term:`virtualenv` package into your setuptools-enabled Python interpreter, use the ``easy_install`` command. +.. warning:: + + Even though Python 3.3 and better comes with ``pyvenv`` out of the box, + which is similar to ``virtualenv``, we suggest using ``virtualenv`` instead. + ``virtualenv`` works on well Python 3.3. This isn't a recommendation made + for technical reasons, it's one made because it's not feasible for the + authors of this guide to explain setup using multiple virtual environment + systems. We are aiming to not need to make the installation documentation + Turing-complete. + + ``pyvenv`` will work fine. However, if you use ``pyvenv`` instead of + ``virtualenv``, you'll need to understand how to install software such as + ``distribute`` into the virtual environment manually, which this guide does + not cover. + .. code-block:: text $ easy_install virtualenv diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py index ac8cdf2d5..1d2d690fc 100644 --- a/docs/tutorials/wiki/src/authorization/setup.py +++ b/docs/tutorials/wiki/src/authorization/setup.py @@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() requires = [ 'pyramid', 'pyramid_zodbconn', + 'transaction', 'pyramid_tm', 'pyramid_debugtoolbar', 'ZODB3', diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py index c4a9067b6..647c3a638 100644 --- a/docs/tutorials/wiki/src/basiclayout/setup.py +++ b/docs/tutorials/wiki/src/basiclayout/setup.py @@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() requires = [ 'pyramid', 'pyramid_zodbconn', + 'transaction', 'pyramid_tm', 'pyramid_debugtoolbar', 'ZODB3', diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py index c4a9067b6..647c3a638 100644 --- a/docs/tutorials/wiki/src/models/setup.py +++ b/docs/tutorials/wiki/src/models/setup.py @@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() requires = [ 'pyramid', 'pyramid_zodbconn', + 'transaction', 'pyramid_tm', 'pyramid_debugtoolbar', 'ZODB3', diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py index b7e0a8935..a665611bd 100644 --- a/docs/tutorials/wiki/src/tests/setup.py +++ b/docs/tutorials/wiki/src/tests/setup.py @@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() requires = [ 'pyramid', 'pyramid_zodbconn', + 'transaction', 'pyramid_tm', 'pyramid_debugtoolbar', 'ZODB3', diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py index ac8cdf2d5..1d2d690fc 100644 --- a/docs/tutorials/wiki/src/views/setup.py +++ b/docs/tutorials/wiki/src/views/setup.py @@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() requires = [ 'pyramid', 'pyramid_zodbconn', + 'transaction', 'pyramid_tm', 'pyramid_debugtoolbar', 'ZODB3', diff --git a/docs/tutorials/wiki/tests.rst b/docs/tutorials/wiki/tests.rst index ebb4d93dc..46d009d0f 100644 --- a/docs/tutorials/wiki/tests.rst +++ b/docs/tutorials/wiki/tests.rst @@ -62,7 +62,7 @@ Change the ``requires`` list in ``setup.py`` to include ``WebTest``. .. literalinclude:: src/tests/setup.py :linenos: :language: python - :lines: 9-18 + :lines: 9-19 After we've added a dependency on WebTest in ``setup.py``, we need to rerun ``setup.py develop`` to get WebTest installed into our virtualenv. Assuming diff --git a/pyramid/config/views.py b/pyramid/config/views.py index d1b69566b..2a93ffbec 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -37,7 +37,6 @@ from pyramid import renderers from pyramid.compat import ( string_types, urlparse, - im_func, url_quote, WIN, is_bound_method, diff --git a/pyramid/scaffolds/zodb/setup.py_tmpl b/pyramid/scaffolds/zodb/setup.py_tmpl index acdf095d5..df239f5a7 100644 --- a/pyramid/scaffolds/zodb/setup.py_tmpl +++ b/pyramid/scaffolds/zodb/setup.py_tmpl @@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() requires = [ 'pyramid', 'pyramid_zodbconn', + 'transaction', 'pyramid_tm', 'pyramid_debugtoolbar', 'ZODB3', |