Merge branch 'master' into feature.configure_tree_bucket_sizes

zopefoundation · Mar 17, 2014 · 417e428 · 417e428
2 parents 70b99df + 4c6f43b
commit 417e428
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,6 +5,8 @@
 4.0.9 (unreleased)
 ------------------
 
+- Added support for Python 3.4.
+
 - Update pure-Python and C trees / sets to accept explicit None to indicate 
   max / min value for ``minKey``, ``maxKey``.  (PR #3)
 

diff --git a/setup.py b/setup.py
@@ -127,6 +127,7 @@ def BTreeExtension(family):
         '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",
         "Framework :: ZODB",

diff --git a/tox.ini b/tox.ini
@@ -3,7 +3,7 @@ envlist =
 # Jython support pending 2.7 support, due 2012-07-15 or so.  See:
 # http://fwierzbicki.blogspot.com/2012/03/adconion-to-fund-jython-27.html
 #   py26,py27,py32,jython,pypy,coverage,docs
-    py26,py27,py27-pure,pypy,py32,py33,w_zodb,coverage,docs
+    py26,py27,py27-pure,pypy,py32,py33,py34,w_zodb,coverage,docs
 
 [testenv]
 deps =