Skip to content

Commit

Permalink
prep for 1.0a4
Browse files Browse the repository at this point in the history
  • Loading branch information
mcdonc committed Nov 21, 2010
1 parent 94a5271 commit 7eb4adc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
15 changes: 8 additions & 7 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Next release
============
1.0a4 (2010-11-21)
==================

Features
--------
Expand All @@ -8,10 +8,11 @@ Features
in the pattern, instead of immediately following a ``/``.

- URL Dispatch now uses the form ``{marker}`` to denote a replace marker in
the route pattern instead of ``:marker``. The old syntax is still backwards
compatible and accepted. The new format allows a regular expression for that
marker location to be used instead of the default ``[^/]+``, for example
``{marker:\d+}`` is now valid to require the marker to be digits.
the route pattern instead of ``:marker``. The old colon-style marker syntax
is still accepted for backwards compatibility. The new format allows a
regular expression for that marker location to be used instead of the
default ``[^/]+``, for example ``{marker:\d+}`` is now valid to require the
marker to be digits.

- Add a ``pyramid.url.route_path`` API, allowing folks to generate relative
URLs. Calling ``route_path`` is the same as calling
Expand Down Expand Up @@ -62,7 +63,7 @@ Bug Fixes
ASCII string rather than being passed along to downstream code as a
convenience to the user and to prevent puzzling second-order failures from
cropping up (all failures will occur within ``pyramid.traversal.traverse``
rather than later down the line as the result of calling
rather than later down the line as the result of calling e.g.
``traversal_path``).

Backwards Incompatibilities
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def nothing(*arg):
# other places throughout the built documents.
#
# The short X.Y version.
version = '1.0a3'
version = '1.0a4'
# The full version, including alpha/beta/rc tags.
release = version

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
##############################################################################

__version__ = '0.0'
__version__ = '1.0a4'

import os
import platform
Expand Down

0 comments on commit 7eb4adc

Please sign in to comment.