summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into developmentdevelopmentChris Jerdonek2014-09-302-3/+2
|\
| * Merge pull request #161 from pombredanne/patch-1HEADmasterChris Jerdonek2014-09-301-1/+1
| |\ | | | | | | Fixed typo in docstring
| | * Fixed typo in docstringPhilippe Ombredanne2014-04-151-1/+1
| | |
| * | Remove Python 2.5 from .travis.yml.Chris Jerdonek2014-09-301-2/+1
| | | | | | | | | | | | | | | | | | Travis CI no longer supports Python 2.5. Thanks to @dmorrison42 for pointing this out. Removing 2.5 from the Travis config should make the Travis build status image work again.
* | | Merge branch 'master' into developmentKevin Carrogan2014-05-122-0/+10
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: HISTORY.md setup_description.rst
| * | Updating history for 0.5.4 release.v0.5.4Kevin Carrogan2014-05-122-0/+10
| | |
* | | Merge branch 'master' into developmentKevin Carrogan2014-05-091-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: pystache/__init__.py setup.py
| * | Bumping version number.Kevin Carrogan2014-05-093-39/+39
| | |
| * | Making test OS agnostic.Kevin Carrogan2014-05-091-2/+2
| |/
* | Add TODO re: tox documentation.Chris Jerdonek2013-09-151-0/+1
| |
* | Remove py24 from tox.ini and add py33.Chris Jerdonek2013-09-152-6/+3
| |
* | Close issue #138.Chris Jerdonek2013-09-151-1/+0
| |
* | Rerun 'python setup.py prep' with pandoc 1.10.1.Chris Jerdonek2013-09-151-37/+49
| |
* | Set PYTHONHASHSEED to "random" when running tox.Chris Jerdonek2013-09-152-0/+6
| |
* | Avoid using the "ur" string prefix.Chris Jerdonek2013-09-151-2/+2
|\ \ | | | | | | | | | | | | | | | This commit is more a matter of style since the Python 3 code generated by 2to3 is valid under Python 3.3. This merges remote-tracking branch 'sentience/development' into development and closes issue #152.
| * | Fix another Python 3.3 syntax error.Kevin Yank2013-09-151-1/+1
| | |
| * | Fix syntax error in Python 3.3.Kevin Yank2013-09-151-1/+1
| | | | | | | | | | | | “Unicode Raw” strings are no longer supported in Python 3.3, and cause a syntax error. See http://bugs.python.org/issue15096. Without this fix, Pystache gives a syntax error when used in a Python 3.3 environment.
* | | Add TODO's re: PYTHONHASHSEED.Chris Jerdonek2013-09-151-0/+2
| | |
* | | Fix a flaky doctest.Chris Jerdonek2013-09-152-3/+8
| | | | | | | | | | | | | | | Make repr() deterministic for the class pystache.tests.common.Attachable added for issue #99.
* | | Add test_pystache.sh for testing PYTHONHASHSEED values.Chris Jerdonek2013-09-151-0/+11
| | |
* | | Add PYTHONHASHSEED to the test output.Chris Jerdonek2013-09-152-0/+3
|/ /
* | Add to setup.py info about running the setup.py register command.Chris Jerdonek2012-11-041-0/+5
| |
* | Prep for version 0.6.0.Chris Jerdonek2012-11-043-2/+7
| |
* | Merge branch 'master' into development: changes for 0.5.3.Chris Jerdonek2012-11-0411-40/+62
|\ \ | |/ | | | | | | Conflicts: TODO.md
| * Add TODO re: center alignment of images in reST output.Chris Jerdonek2012-11-041-0/+1
| |
| * Remove center-alignment of reST images.Chris Jerdonek2012-11-042-4/+2
| |
| * Make setup.py print to stderr instead of stdout in at least one case.Chris Jerdonek2012-11-041-1/+1
| | | | | | | | | | This helps when piping the output of `python setup.py --long-description` to other programs like rst2html.py.
| * Fix Travis file after test-script changes from previous commit.v0.5.3Chris Jerdonek2012-11-031-1/+1
| |
| * Allow tox to run from a downloaded sdist (i.e. without spec tests).Chris Jerdonek2012-11-035-23/+31
| |
| * Update the release date.Chris Jerdonek2012-11-033-5/+5
| |
| * Update setup_description.rst by running `python setup.py prep`.Chris Jerdonek2012-11-031-4/+13
| |
| * Bump version to 0.5.3 in preparation for push to PyPI.Chris Jerdonek2012-11-032-2/+2
| |
| * Add a TODO to write a unit test for running tests from an sdist.Chris Jerdonek2012-10-281-2/+5
| |
| * Add note to MANIFEST.in re: gh/ directory.Chris Jerdonek2012-10-281-0/+3
| |
* | Add TODO re: the _PartialNode class.Chris Jerdonek2012-10-231-0/+2
| |
* | Merge branch 'master' into developmentChris Jerdonek2012-10-233-7/+9
|\ \ | |/
| * Adjust Python 2.4 wording in HISTORY.Chris Jerdonek2012-10-222-6/+1
| |
| * Change image to point to the gh-pages version.Chris Jerdonek2012-10-221-1/+1
| |
| * Add test_pystache.py bug fix to HISTORY.Chris Jerdonek2012-10-221-0/+2
| |
| * Add notes about Python 2.4 and 3.3 to HISTORY and README.Chris Jerdonek2012-10-222-0/+5
| |
| * Update README link to point to gh-pages.Chris Jerdonek2012-10-201-1/+1
|/
* Change image URL to point to the repository.Chris Jerdonek2012-10-201-1/+1
|
* Add Python 3.3 support to documentation (but not to the Tox configuration).Chris Jerdonek2012-10-203-0/+4
|
* Tweak README wording.Chris Jerdonek2012-10-201-1/+1
|
* Remove branch names in Travis build status image URL.Chris Jerdonek2012-10-201-1/+1
| | | | | | | | Comma-delimiting branch names in the build status image URL for Travis-CI does not currently work, so this commit switches to not specifying any branch names until this is fixed. See also the Travis-CI issue: https://github.com/travis-ci/travis-ci/issues/731
* Merge branch 'development' into 'master': staging v0.5.3-rcChris Jerdonek2012-10-2039-966/+2435
|\
| * Update setup_description.rst via `python setup.py prep`.Chris Jerdonek2012-10-201-3/+17
| |
| * Bump version to 0.5.3-rc prior to merge to master.Chris Jerdonek2012-10-202-2/+2
| |
| * Add TODO to MANIFEST.Chris Jerdonek2012-10-201-0/+1
| |
| * Prevent test_pystache.py from expecting spec tests if spec test directory ↵Chris Jerdonek2012-10-201-2/+9
| | | | | | | | | | | | | | not present. Prior to this commit, running test_pystache.py from a downloaded sdist has a test failure because the spec tests are not found.