add py3.4 support and doc updating

- remove repoze cruft - add py3.4 support - update documentation regarding version support - all tests passing in py3.4 - changed README.txt and CHANGES.txt to .rst files
Pylons · Apr 21, 2015 · 17d7cb0 · 17d7cb0
1 parent 771bc06
commit 17d7cb0
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 31 deletions.
diff --git a/CHANGES.txt → CHANGES.rst b/CHANGES.txt → CHANGES.rst
@@ -1,6 +1,11 @@
 Changes
 =======
 
+0.6 (unreleased)
+----------------
+
+- Add support for Python 3.4.
+
 0.5 (2014-09-29)
 ----------------
 

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -105,3 +105,4 @@ Contributors
 - Atsushi Odagiri, 2012/02/05
 - Valentin Ungureanu, 2012/02/06
 - Shane Hathaway, 2013/04/13
+- Tim Tisdall, 2015/04/21
diff --git a/README.txt → README.rst b/README.txt → README.rst
@@ -3,8 +3,8 @@ Peppercorn
 
 A library for converting a token stream into a data structure comprised of
 sequences, mappings, and scalars, developed primarily for converting HTTP form
-post data into a richer data structure.  It runs on Python 2.6, 2.7, 3.2, and
-3.3.
+post data into a richer data structure.  It runs on Python 2.6, 2.7, 3.2,
+3.3, and 3.4.
 
 Please see http://docs.pylonsproject.org/projects/peppercorn/en/latest/
 for the documentation.

diff --git a/docs/.static/logo_hi.gif b/docs/.static/logo_hi.gif
diff --git a/docs/.static/repoze.css b/docs/.static/repoze.css
diff --git a/docs/conf.py b/docs/conf.py
@@ -139,7 +139,7 @@
 
 # The name of an image file (within the static path) to place at the top of
 # the sidebar.
-html_logo = '.static/logo_hi.gif'
+#html_logo = '.static/logo_hi.gif'
 
 # The name of an image file (within the static path) to use as favicon of
 # the docs.  This file should be a Windows icon file (.ico) being 16x16 or
@@ -211,7 +211,7 @@
 
 # The name of an image file (relative to this directory) to place at the
 # top of the title page.
-latex_logo = '.static/logo_hi.gif'
+#latex_logo = '.static/logo_hi.gif'
 
 # For "manual" documents, if this is true, then toplevel headings are
 # parts, not chapters.

diff --git a/docs/index.rst b/docs/index.rst
@@ -3,8 +3,8 @@ Peppercorn
 
 A library for converting a token stream into a data structure comprised of
 sequences, mappings, and scalars, developed primarily for converting HTTP
-form post data into a richer data structure.  It runs on Python 2.5, 2.6, 2.7
-and 3.2.
+form post data into a richer data structure.  It runs on Python 2.6, 2.7,
+3.2, 3.3 and 3.4.
 
 Example "bare" usage:
 

diff --git a/setup.py b/setup.py
@@ -20,8 +20,8 @@
 here = os.path.abspath(os.path.dirname(__file__))
 
 try:
-    README = open(os.path.join(here, 'README.txt')).read()
-    CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
+    README = open(os.path.join(here, 'README.rst')).read()
+    CHANGES = open(os.path.join(here, 'CHANGES.rst')).read()
 except:
     README = ''
     CHANGES = ''
@@ -43,6 +43,7 @@
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.2",
         "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist = 
-    py26,py27,py32,py33,pypy,cover
+    py26,py27,py32,py33,py34,pypy,cover
 
 [testenv]
 commands =