From 26f201e7271565a3f414bcf53252a82ed06ce833 Mon Sep 17 00:00:00 2001 From: Kevin Carrogan Date: Fri, 9 May 2014 20:43:22 +0100 Subject: Bumping version number. --- pystache/__init__.py | 2 +- setup.py | 2 +- setup_description.rst | 74 +++++++++++++++++++++++++-------------------------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/pystache/__init__.py b/pystache/__init__.py index 71708c3..4cf2434 100644 --- a/pystache/__init__.py +++ b/pystache/__init__.py @@ -10,4 +10,4 @@ from pystache.init import parse, render, Renderer, TemplateSpec __all__ = ['parse', 'render', 'Renderer', 'TemplateSpec'] -__version__ = '0.5.3' # Also change in setup.py. +__version__ = '0.5.4' # Also change in setup.py. diff --git a/setup.py b/setup.py index 4cb2e78..0d99aae 100644 --- a/setup.py +++ b/setup.py @@ -112,7 +112,7 @@ else: setup = dist.setup -VERSION = '0.5.3' # Also change in pystache/__init__.py. +VERSION = '0.5.4' # Also change in pystache/__init__.py. FILE_ENCODING = 'utf-8' diff --git a/setup_description.rst b/setup_description.rst index e4a0900..cec68a3 100644 --- a/setup_description.rst +++ b/setup_description.rst @@ -10,23 +10,23 @@ Pystache .. figure:: https://secure.travis-ci.org/defunkt/pystache.png :alt: Travis CI current build status -`Pystache `_ is a Python -implementation of `Mustache `_. Mustache is -a framework-agnostic, logic-free templating system inspired by -`ctemplate `_ and -`et `_. +`Pystache `__ is a Python +implementation of `Mustache `__. Mustache +is a framework-agnostic, logic-free templating system inspired by +`ctemplate `__ and +`et `__. Like ctemplate, Mustache "emphasizes separating logic from presentation: it is impossible to embed application logic in this template language." -The `mustache(5) `_ man page -provides a good introduction to Mustache's syntax. For a more complete -(and more current) description of Mustache's behavior, see the official -`Mustache spec `_. +The `mustache(5) `__ man +page provides a good introduction to Mustache's syntax. For a more +complete (and more current) description of Mustache's behavior, see the +official `Mustache spec `__. -Pystache is `semantically versioned `_ and can be -found on `PyPI `_. This version of -Pystache passes all tests in `version -1.1.2 `_ of the spec. +Pystache is `semantically versioned `__ and can be +found on `PyPI `__. This version +of Pystache passes all tests in `version +1.1.2 `__ of the spec. Requirements ------------ @@ -34,27 +34,27 @@ Requirements Pystache is tested with-- - Python 2.4 (requires simplejson `version - 2.0.9 `_ or earlier) + 2.0.9 `__ or earlier) - Python 2.5 (requires - `simplejson `_) + `simplejson `__) - Python 2.6 - Python 2.7 - Python 3.1 - Python 3.2 - Python 3.3 -- `PyPy `_ +- `PyPy `__ -`Distribute `_ (the setuptools +`Distribute `__ (the setuptools fork) is recommended over -`setuptools `_, and is required +`setuptools `__, and is required in some cases (e.g. for Python 3 support). If you use -`pip `_, you probably already satisfy +`pip `__, you probably already satisfy this requirement. JSON support is needed only for the command-line interface and to run the spec tests. We require simplejson for earlier versions of Python -since Python's `json `_ module -was added in Python 2.6. +since Python's `json `__ +module was added in Python 2.6. For Python 2.4 we require an earlier version of simplejson since simplejson stopped officially supporting Python 2.4 in simplejson @@ -129,9 +129,9 @@ directory), use the ``Renderer`` class like above. One can pass attributes to the Renderer class constructor or set them on a Renderer instance. To customize template loading on a per-view basis, subclass ``TemplateSpec``. See the docstrings of the -`Renderer `_ +`Renderer `__ class and -`TemplateSpec `_ +`TemplateSpec `__ class for more information. You can also pre-parse a template: @@ -174,7 +174,7 @@ This section describes how Pystache handles unicode, strings, and encodings. Internally, Pystache uses `only unicode -strings `_ +strings `__ (``str`` in Python 3 and ``unicode`` in Python 2). For input, Pystache accepts both unicode strings and byte strings (``bytes`` in Python 3 and ``str`` in Python 2). For output, Pystache's template rendering methods @@ -214,7 +214,7 @@ To test from a source distribution (without installing)-- python test_pystache.py To test Pystache with multiple versions of Python (with a single -command!), you can use `tox `_: +command!), you can use `tox `__: :: @@ -238,15 +238,15 @@ runs: git submodule update The test harness parses the spec's (more human-readable) yaml files if -`PyYAML `_ is present. Otherwise, it -parses the json files. To install PyYAML-- +`PyYAML `__ is present. Otherwise, +it parses the json files. To install PyYAML-- :: pip install pyyaml To run a subset of the tests, you can use -`nose `_: +`nose `__: :: @@ -268,11 +268,11 @@ To convert the code to Python 3 manually (while using Python 3)-- This writes the converted code to a subdirectory called ``build``. By design, Python 3 builds -`cannot `_ +`cannot `__ be created from Python 2. To convert the code without using setup.py, you can use -`2to3 `_ as follows (two +`2to3 `__ as follows (two steps)-- :: @@ -293,7 +293,7 @@ Pystache while using Python 3. Mailing List ------------ -There is a `mailing list `_. +There is a `mailing list `__. Note that there is a bit of a delay between posting a message and seeing it appear in the mailing list archive. @@ -307,9 +307,9 @@ Credits Author: Chris Wanstrath Maintainer: Chris Jerdonek -Pystache logo by `David Phillips `_ is +Pystache logo by `David Phillips `__ is licensed under a `Creative Commons Attribution-ShareAlike 3.0 Unported -License `_. +License `__. |image0| History @@ -335,8 +335,8 @@ History parse tree. - Added support for rendering pre-compiled templates. - Added Python 3.3 to the list of supported versions. -- Added support for `PyPy `_ (issue #125). -- Added support for `Travis CI `_ (issue #124). +- Added support for `PyPy `__ (issue #125). +- Added support for `Travis CI `__ (issue #124). [msabramo] - Bugfix: ``defaults.DELIMITERS`` can now be changed at runtime (issue #135). [bennoleslie] @@ -385,7 +385,7 @@ Below is a selection of some of the changes (not exhaustive). Highlights: - Pystache now passes all tests in version 1.0.3 of the `Mustache - spec `_. [pvande] + spec `__. [pvande] - Removed View class: it is no longer necessary to subclass from View or from any other class to create a view. - Replaced Template with Renderer class: template rendering behavior @@ -395,7 +395,7 @@ Highlights: per-view basis by subclassing from TemplateSpec. - Introduced separation of concerns and removed circular dependencies (e.g. between Template and View classes, cf. `issue - #13 `_). + #13 `__). - Unicode now used consistently throughout the rendering process. - Expanded test coverage: nosetests now runs doctests and ~105 test cases from the Mustache spec (increasing the number of tests from 56 -- cgit v1.2.1