Add offical support for PyPy.

3 files changed, 8 insertions, 2 deletions

diff --git a/.travis.yml b/.travis.yml
index 90f7740..89ec558 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ env:
   - TOXENV=py32
   - TOXENV=py33
   - TOXENV=py34
+  - TOXENV=pypy
   - TOXENV=flake8
 before_install:
   - sudo apt-get update -qq
diff --git a/docs/release-2.6.txt b/docs/release-2.6.txt
index 2aaf20b..d6e3c19 100644
--- a/docs/release-2.6.txt
+++ b/docs/release-2.6.txt
@@ -10,7 +10,7 @@ Python-Markdown 2.6 Release Notes
 We are pleased to release Python-Markdown 2.6 which adds a few new features
 and fixes various bugs. See the list of changes below for details.
 
-Python-Markdown version 2.6 supports Python versions 2.7, 3.2, 3.3, and 3.4.
+Python-Markdown version 2.6 supports Python versions 2.7, 3.2, 3.3, and 3.4 as well as PyPy.
 
 Backwards-incompatible Changes
 ------------------------------
@@ -112,6 +112,11 @@ Backwards-incompatible Changes
 What's New in Python-Markdown 2.6
 ---------------------------------
 
+*   Official support for [PyPy] has been added. While Python-Markdown has most likley
+worked on PyPy for some time, it is now offically supported and tested on PyPy.
+
+[PyPy]: http://pypy.org/
+
 *   The [Meta-Data] Extension now includes optional support for [YAML] style
     meta-data. By default, the YAML deliminators are recognized, however, the
     actual data is parsed as previously.  This follows the syntax of
diff --git a/tox.ini b/tox.ini
index 309e1fc..9d62ff2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py32, py33, py34, flake8
+envlist = py27, py32, py33, py34, pypy, flake8
 
 [testenv]
 downloadcache = {toxworkdir}/cache