summaryrefslogtreecommitdiff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-08-10 10:28:04 -0500
committerGitHub <noreply@github.com>2018-08-10 10:28:04 -0500
commit3ee04cc62205b10eb9041b0df5e156936765202f (patch)
tree666862c069fce963e4fac454b767f08586687686 /CHANGES.rst
parent0ad05afc020d2790048d4ca85d936b4ea79eae13 (diff)
parent0760eba8fd5a0d8f0424c329ce92e9fb8d003f11 (diff)
downloadpyramid-3ee04cc62205b10eb9041b0df5e156936765202f.tar.gz
pyramid-3ee04cc62205b10eb9041b0df5e156936765202f.tar.bz2
pyramid-3ee04cc62205b10eb9041b0df5e156936765202f.zip
Merge branch 'master' into feature/more-samesite-work
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst21
1 files changed, 19 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index cd4647e82..91dadfa79 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -30,8 +30,8 @@ Features
route_prefix for ``include`` and ``add_route`` calls inside the context.
See https://github.com/Pylons/pyramid/pull/3279
-- Modify the builtin session implementations to support SameSite options on
- cookies and set the default to ``'Lax'``. This affects
+- Modify the builtin session implementations to support ``SameSite`` options
+ on cookies and set the default to ``'Lax'``. This affects
``pyramid.session.BaseCookieSessionFactory``,
``pyramid.session.SignedCookieSessionFactory``, and
``pyramid.session.UnencryptedCookieSessionFactoryConfig``.
@@ -46,6 +46,14 @@ Features
exception/response object for a HTTP 308 redirect.
See https://github.com/Pylons/pyramid/pull/3302
+- Within ``pshell``, allow the user-defined ``setup`` function to be a
+ generator, in which case it may wrap the command's lifecycle.
+ See https://github.com/Pylons/pyramid/pull/3318
+
+- Within ``pshell``, variables defined by the ``[pshell]`` settings are
+ available within the user-defined ``setup`` function.
+ See https://github.com/Pylons/pyramid/pull/3318
+
Bug Fixes
---------
@@ -81,9 +89,18 @@ Backward Incompatibilities
``pyramid.session.UnencryptedCookieSessionFactoryConfig``.
See https://github.com/Pylons/pyramid/pull/3300
+- Variables defined in the ``[pshell]`` section of the settings will no
+ longer override those set by the ``setup`` function.
+ See https://github.com/Pylons/pyramid/pull/3318
+
Documentation Changes
---------------------
+- Add support for alembic to the pyramid-cookiecutter-alchemy cookiecutter
+ and update the wiki2 tutorial to explain how it works.
+ See https://github.com/Pylons/pyramid/pull/3307 and
+ https://github.com/Pylons/pyramid-cookiecutter-alchemy/pull/7
+
- Bump Sphinx to >= 1.7.4 in setup.py to support ``emphasize-lines`` in PDFs
and to pave the way for xelatex support. See
https://github.com/Pylons/pyramid/pull/3271,