diff options
| -rw-r--r-- | docs/tutorials/wiki/authorization.rst | 4 | ||||
| -rw-r--r-- | docs/tutorials/wiki/basiclayout.rst | 4 | ||||
| -rw-r--r-- | docs/tutorials/wiki/definingmodels.rst | 4 | ||||
| -rw-r--r-- | docs/tutorials/wiki/definingviews.rst | 4 | ||||
| -rw-r--r-- | docs/tutorials/wiki/index.rst | 5 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/authorization.rst | 4 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/basiclayout.rst | 4 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/definingmodels.rst | 4 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/definingviews.rst | 4 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/index.rst | 4 | ||||
| -rw-r--r-- | setup.cfg | 3 | ||||
| -rw-r--r-- | setup.py | 7 | ||||
| -rw-r--r-- | tox.ini | 12 |
13 files changed, 37 insertions, 26 deletions
diff --git a/docs/tutorials/wiki/authorization.rst b/docs/tutorials/wiki/authorization.rst index c1be2cc72..e599e7086 100644 --- a/docs/tutorials/wiki/authorization.rst +++ b/docs/tutorials/wiki/authorization.rst @@ -24,8 +24,8 @@ Finally, we will add a ``login.pt`` template and change the existing ``view.pt`` and ``edit.pt`` to show a "Logout" link when not logged in. The source code for this tutorial stage can be browsed via -`http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/authorization/ -<http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/authorization/>`_. +`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/authorization/ +<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/authorization/>`_. Add Authentication and Authorization Policies ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst index 308c8e292..f6050f391 100644 --- a/docs/tutorials/wiki/basiclayout.rst +++ b/docs/tutorials/wiki/basiclayout.rst @@ -7,8 +7,8 @@ they provide a good orientation for the high-level patterns common to most :term:`traversal` -based :app:`Pyramid` (and :term:`ZODB` based) projects. The source code for this tutorial stage can be browsed via -`http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/basiclayout/ -<http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/basiclayout/>`_. +`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/basiclayout/ +<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/basiclayout/>`_. Application Configuration with ``__init__.py`` ------------------------------------------------ diff --git a/docs/tutorials/wiki/definingmodels.rst b/docs/tutorials/wiki/definingmodels.rst index 982d6ea74..1a5d38b10 100644 --- a/docs/tutorials/wiki/definingmodels.rst +++ b/docs/tutorials/wiki/definingmodels.rst @@ -15,8 +15,8 @@ single instance of the "Wiki" class will serve as a container for "Page" objects, which will be instances of the "Page" class. The source code for this tutorial stage can be browsed via -`http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/models/ -<http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/models/>`_. +`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/models/ +<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/models/>`_. Delete the Database ------------------- diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst index 53e60fda3..12bfa8b84 100644 --- a/docs/tutorials/wiki/definingviews.rst +++ b/docs/tutorials/wiki/definingviews.rst @@ -29,8 +29,8 @@ We're going to define several :term:`view callable` functions, then wire them into :app:`Pyramid` using some :term:`view configuration`. The source code for this tutorial stage can be browsed via -`http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/views/ -<http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/views/>`_. +`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/views/ +<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src/views/>`_. Declaring Dependencies in Our ``setup.py`` File =============================================== diff --git a/docs/tutorials/wiki/index.rst b/docs/tutorials/wiki/index.rst index f07f45bd0..c918f8765 100644 --- a/docs/tutorials/wiki/index.rst +++ b/docs/tutorials/wiki/index.rst @@ -10,9 +10,8 @@ tutorial, the developer will have created a basic Wiki application with authentication. For cut and paste purposes, the source code for all stages of this -tutorial can be browsed at -`http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/ -<http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/>`_. +tutorial can be browsed at `https://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src +<https://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki/src>`_. .. toctree:: :maxdepth: 2 diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst index c695c7da4..8c1c50ff6 100644 --- a/docs/tutorials/wiki2/authorization.rst +++ b/docs/tutorials/wiki2/authorization.rst @@ -27,8 +27,8 @@ We will do the following steps: (``view.pt``, ``edit.pt``). The source code for this tutorial stage can be browsed at -`http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src/authorization/ -<http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src/authorization/>`_. +`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/authorization/ +<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/authorization/>`_. Adding A Root Factory ~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst index a5e900e4c..6715b2bd7 100644 --- a/docs/tutorials/wiki2/basiclayout.rst +++ b/docs/tutorials/wiki2/basiclayout.rst @@ -7,8 +7,8 @@ they provide a good orientation for the high-level patterns common to most :term:`url dispatch` -based :app:`Pyramid` projects. The source code for this tutorial stage can be browsed at -`http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src/basiclayout/ -<http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src/basiclayout/>`_. +`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/basiclayout/ +<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/basiclayout/>`_. Application Configuration with ``__init__.py`` ---------------------------------------------- diff --git a/docs/tutorials/wiki2/definingmodels.rst b/docs/tutorials/wiki2/definingmodels.rst index 64ab59844..1653faf4a 100644 --- a/docs/tutorials/wiki2/definingmodels.rst +++ b/docs/tutorials/wiki2/definingmodels.rst @@ -7,8 +7,8 @@ be to define a :term:`domain model` constructor representing a wiki page. We'll do this inside our ``models.py`` file. The source code for this tutorial stage can be browsed at -`http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src/models/ -<http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src/models/>`_. +`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/models/ +<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/models/>`_. Making Edits to ``models.py`` ----------------------------- diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst index e1eb2cf1f..ac58e1e46 100644 --- a/docs/tutorials/wiki2/definingviews.rst +++ b/docs/tutorials/wiki2/definingviews.rst @@ -17,8 +17,8 @@ have a ``'one'`` key with the value ``'foo'`` and a ``'two'`` key with the value ``'bar'``. The source code for this tutorial stage can be browsed at -`http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src/views/ -<http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src/views/>`_. +`http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/views/ +<http://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src/views/>`_. Declaring Dependencies in Our ``setup.py`` File =============================================== diff --git a/docs/tutorials/wiki2/index.rst b/docs/tutorials/wiki2/index.rst index 3a165291a..72a73ec42 100644 --- a/docs/tutorials/wiki2/index.rst +++ b/docs/tutorials/wiki2/index.rst @@ -11,8 +11,8 @@ basic Wiki application with authentication. For cut and paste purposes, the source code for all stages of this tutorial can be browsed at -`http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src/ -<http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src/>`_. +`https://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src +<https://github.com/Pylons/pyramid/tree/1.3-branch/docs/tutorials/wiki2/src>`_. .. toctree:: :maxdepth: 2 @@ -8,3 +8,6 @@ nocapture=1 cover-package=pyramid cover-erase=1 +[aliases] +dev = develop easy_install pyramid[testing] + @@ -48,7 +48,9 @@ install_requires=[ 'PasteDeploy >= 1.5.0', # py3 compat ] -tests_require = install_requires + [ +tests_require = [ + 'nose', + 'coverage', 'WebTest >= 1.3.1', # py3 compat 'virtualenv', ] @@ -89,6 +91,9 @@ setup(name='pyramid', include_package_data=True, zip_safe=False, install_requires = install_requires, + extras_require = { + 'testing':tests_require, + }, tests_require = tests_require, test_suite="pyramid.tests", entry_points = """\ @@ -11,7 +11,9 @@ deps = repoze.sphinx.autointerface WebTest virtualenv - venusian>=1.0a3 + venusian + nose + coverage [testenv:py32] commands = @@ -19,7 +21,9 @@ commands = deps = WebTest virtualenv - venusian>=1.0a3 + venusian + nose + coverage [testenv:cover] basepython = @@ -32,9 +36,9 @@ deps = WebTest repoze.sphinx.autointerface virtualenv - venusian>=1.0a3 + venusian nose - coverage==3.4 + coverage nosexcover # we separate coverage into its own testenv because a) "last run wins" wrt |