diff options
| -rw-r--r-- | CHANGES.rst | 10 | ||||
| -rw-r--r-- | HACKING.txt | 6 | ||||
| -rw-r--r-- | docs/quick_tutorial/json.rst | 2 | ||||
| -rw-r--r-- | docs/quick_tutorial/view_classes.rst | 2 | ||||
| -rw-r--r-- | setup.cfg | 1 | ||||
| -rw-r--r-- | src/pyramid/config/views.py | 2 |
6 files changed, 12 insertions, 11 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 8cf6eaff6..0e6d69252 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,11 +4,6 @@ unreleased Features -------- -- Deprecated ``pyramid.session.PickleSerializer``. - See https://github.com/pylons/pyramid/issues/2709 - and https://github.com/pylons/pyramid/pull/3353 - and https://github.com/pylons/pyramid/pull/3413 - - Changed the default ``serializer`` on ``pyramid.session.SignedCookieSessionFactory`` to use ``pyramid.session.JSONSerializer`` instead of @@ -73,6 +68,11 @@ Features Deprecations ------------ +- Deprecated ``pyramid.session.PickleSerializer``. + See https://github.com/pylons/pyramid/issues/2709 + and https://github.com/pylons/pyramid/pull/3353 + and https://github.com/pylons/pyramid/pull/3413 + Backward Incompatibilities -------------------------- diff --git a/HACKING.txt b/HACKING.txt index 901eb8518..5ccc318de 100644 --- a/HACKING.txt +++ b/HACKING.txt @@ -74,10 +74,10 @@ Running Tests to your virtual environment: # run a single test - $ $VENV/bin/nosetests pyramid.tests.test_module:ClassName.test_mytestname + $ $VENV/bin/nosetests tests.test_module:ClassName.test_mytestname # run all tests in a class - $ $VENV/bin/nosetests pyramid.tests.test_module:ClassName + $ $VENV/bin/nosetests tests.test_module:ClassName Optionally you can install a nose plugin `nose-selecttests` to run specific tests. @@ -93,7 +93,7 @@ Running Tests tests like so: $ $VENV/bin/pip install pytest - $ $VENV/bin/pytest --strict pyramid/ + $ $VENV/bin/pytest --strict pyramid/ tests/ To run individual tests (i.e., during development), see "pytest usage - Specifying tests / selecting tests": diff --git a/docs/quick_tutorial/json.rst b/docs/quick_tutorial/json.rst index 44d1de8cb..19d346199 100644 --- a/docs/quick_tutorial/json.rst +++ b/docs/quick_tutorial/json.rst @@ -63,7 +63,7 @@ Steps .. code-block:: bash - $ $VENV/bin/pserve development.ini --reload + $VENV/bin/pserve development.ini --reload #. Open http://localhost:6543/howdy.json in your browser and you will see the resulting JSON response. diff --git a/docs/quick_tutorial/view_classes.rst b/docs/quick_tutorial/view_classes.rst index 1307857b7..c9f61f5a3 100644 --- a/docs/quick_tutorial/view_classes.rst +++ b/docs/quick_tutorial/view_classes.rst @@ -78,7 +78,7 @@ To ease the transition to view classes, we didn't introduce any new functionality. We simply changed the view functions to methods on a view class, then updated the tests. -In our ``TutorialViews`` view class, you can see that our two view classes are +In our ``TutorialViews`` view class, you can see that our two view functions are logically grouped together as methods on a common class. Since the two views shared the same template, we could move that to a ``@view_defaults`` decorator at the class level. @@ -3,7 +3,6 @@ zip_ok = false [nosetests] match = ^test -tests = tests nocapture = 1 [aliases] diff --git a/src/pyramid/config/views.py b/src/pyramid/config/views.py index 509a64b2b..3071de1e5 100644 --- a/src/pyramid/config/views.py +++ b/src/pyramid/config/views.py @@ -2060,6 +2060,8 @@ class ViewsConfiguratorMixin(object): :class:`~pyramid.interfaces.ICacheBuster` interface. Default: ``False``. + .. versionadded:: 1.6 + """ spec = self._make_spec(path) info = self._get_static_info() |