aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/change_log.txt8
-rw-r--r--docs/release-2.2.0.txt4
-rw-r--r--docs/release-2.2.1.txt12
-rw-r--r--fabfile.py2
-rw-r--r--markdown/__init__.py4
-rwxr-xr-xsetup.py3
-rw-r--r--tests/test_extensions.py2
7 files changed, 25 insertions, 10 deletions
diff --git a/docs/change_log.txt b/docs/change_log.txt
index 3265aef..30cb771 100644
--- a/docs/change_log.txt
+++ b/docs/change_log.txt
@@ -1,12 +1,16 @@
title: Change Log
prev_title: Test Suite
prev_url: test_suite.html
-next_title: Release Notes for v2.2.0
-next_url: release-2.2.0.html
+next_title: Release Notes for v2.2.1
+next_url: release-2.2.1.html
Python-Markdown Changelog
=========================
+Nov 4, 2012: Released version 2.2.1 ([Notes](release-2.2.1.html)).
+
+Jul 5, 2012: Released version 2.2.0 (Notes](release-2.2.0.html)).
+
Jan 22, 2012: Released version 2.1.1 ([Notes](release-2.1.1.html)).
Nov 24, 2011: Released version 2.1.0 ([Notes](release-2.1.0.html)).
diff --git a/docs/release-2.2.0.txt b/docs/release-2.2.0.txt
index d7081eb..59ac78f 100644
--- a/docs/release-2.2.0.txt
+++ b/docs/release-2.2.0.txt
@@ -1,6 +1,6 @@
title: Release Notes for v2.2.0
-prev_title: Change Log
-prev_url: change_log.html
+prev_title: Release Notes for v2.2.1
+prev_url: release-2.2.1.html
next_title: Release Notes for v2.1.1
next_url: release-2.1.1.html
diff --git a/docs/release-2.2.1.txt b/docs/release-2.2.1.txt
new file mode 100644
index 0000000..cdec0ad
--- /dev/null
+++ b/docs/release-2.2.1.txt
@@ -0,0 +1,12 @@
+title: Release Notes for v2.2.1
+prev_title: Change Log
+prev_url: change_log.html
+next_title: Release Notes for v2.2.0
+next_url: release-2.2.0.html
+
+Python-Markdown 2.2.1 Release Notes
+===================================
+
+Python-Markdown 2.2.1 is a bug-fix release. No new features have been added.
+However, at least one bug fix does not work in Python 2.4 so that version of
+Python is no longer supported. For a full list of changes, see the git log.
diff --git a/fabfile.py b/fabfile.py
index 472c769..ea5ba06 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -10,7 +10,7 @@ from sys import platform
def _get_versions():
""" Find and comfirm all supported versions of Python. """
vs = []
- for v in ['2.4', '2.5', '2.6', '2.7', '3.1', '3.2']:
+ for v in ['2.5', '2.6', '2.7', '3.1', '3.2']:
with settings(
hide('warnings', 'running', 'stdout', 'stderr'),
warn_only=True
diff --git a/markdown/__init__.py b/markdown/__init__.py
index 81404e0..cda6b76 100644
--- a/markdown/__init__.py
+++ b/markdown/__init__.py
@@ -30,8 +30,8 @@ Copyright 2004 Manfred Stienstra (the original version)
License: BSD (see LICENSE for details).
"""
-version = "2.2.0"
-version_info = (2,2,0, "final")
+version = "2.2.1"
+version_info = (2,2,1, "final")
import re
import codecs
diff --git a/setup.py b/setup.py
index 6551c5f..c501e0a 100755
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ except ImportError:
raise ImportError("build_py_2to3 is required to build in Python 3.x.")
from distutils.command.build_py import build_py
-version = '2.2.0'
+version = '2.2.1'
# The command line script name. Currently set to "markdown_py" so as not to
# conflict with the perl implimentation (which uses "markdown"). We can't use
@@ -209,7 +209,6 @@ data = dict(
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
- 'Programming Language :: Python :: 2.4',
'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
diff --git a/tests/test_extensions.py b/tests/test_extensions.py
index 15feb6b..315e7ef 100644
--- a/tests/test_extensions.py
+++ b/tests/test_extensions.py
@@ -47,7 +47,7 @@ class TestCodeHilite(unittest.TestCase):
'</pre></div>')
else:
self.assertEqual(self.md.convert(text),
- '<pre><code>Code\n'
+ '<pre class="codehilite"><code># A Code Comment'
'</code></pre>')