summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaylan Limberg <waylan@gmail.com>2014-09-26 18:35:55 -0400
committerWaylan Limberg <waylan@gmail.com>2014-09-26 18:35:55 -0400
commitf0c5b71acbc02af60a33d67c59558bb513b25e74 (patch)
tree8bd1b6525a912ca6cc6d939ccd0df241ac55282f
parent6bc119f3e048d18902ddfc66a9ffe9a47355e29a (diff)
downloadpython-markdown-f0c5b71acbc02af60a33d67c59558bb513b25e74.tar.gz
Upped version to 2.5.12.5.1-final
Also removed an inacurate statement in the 2.5 release notes.
-rw-r--r--docs/change_log.txt6
-rw-r--r--docs/release-2.5.txt5
-rw-r--r--markdown/__version__.py2
3 files changed, 6 insertions, 7 deletions
diff --git a/docs/change_log.txt b/docs/change_log.txt
index 2f1810a..de5eacc 100644
--- a/docs/change_log.txt
+++ b/docs/change_log.txt
@@ -7,9 +7,11 @@ next_url: release-2.5.html
Python-Markdown Changelog
=========================
-Sep 12, 2014: Released version 2.5.0 ([Notes](release-2.5.html))
+Sept 26, 2014: Released version 2.5.1 (a bugfix release).
-Feb 16, 2014: Released version 2.4.0 ([Notes](release-2.4.html))
+Sept 12, 2014: Released version 2.5.0 ([Notes](release-2.5.html)).
+
+Feb 16, 2014: Released version 2.4.0 ([Notes](release-2.4.html)).
Mar 22, 2013: Released version 2.3.1 (a bugfix release).
diff --git a/docs/release-2.5.txt b/docs/release-2.5.txt
index 501fd1f..250332e 100644
--- a/docs/release-2.5.txt
+++ b/docs/release-2.5.txt
@@ -16,10 +16,7 @@ Backwards-incompatible Changes
------------------------------
* Python-Markdown no longer supports Python version 2.6. You must be using Python
- versions 2.7, 3.2, 3.3, or 3.4. While Python-Markdown is no longer tested against
- Python 2.6, you may be able to get it working if you install a copy of [importlib]
- which has been backported for Python 2.6. However, the developers of Python-Markdown
- offer no guarentees in that situation.
+ versions 2.7, 3.2, 3.3, or 3.4.
[importlib]: https://pypi.python.org/pypi/importlib
diff --git a/markdown/__version__.py b/markdown/__version__.py
index cabeff3..d69eed1 100644
--- a/markdown/__version__.py
+++ b/markdown/__version__.py
@@ -5,7 +5,7 @@
# (major, minor, micro, alpha/beta/rc/final, #)
# (1, 1, 2, 'alpha', 0) => "1.1.2.dev"
# (1, 2, 0, 'beta', 2) => "1.2b2"
-version_info = (2, 5, 0, 'final', 0)
+version_info = (2, 5, 1, 'final', 0)
def _get_version():
" Returns a PEP 386-compliant version number from version_info. "