Support Python 3.6, PyPy2.7 an PyPy3.3.

zopefoundation · Feb 4, 2017 · 76dfc1e · 76dfc1e
1 parent 1591831
commit 76dfc1e
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,10 +5,22 @@ python:
     - 3.3
     - 3.4
     - 3.5
+    - 3.6
+    - pypy2-5.6.0
+    - pypy3.3-5.2-alpha1
+env:
+    - ENVIRON=py
+    - ENVIRON=flake8,docs
+matrix:
+    exclude:
+        - env: ENVIRON=flake8,docs
+    include:
+        - python: "3.6"
+          env: ENVIRON=flake8,docs
 install:
     - pip install tox
 script:
-    - tox -e py${TRAVIS_PYTHON_VERSION//[.]/}
+    - tox -e $ENVIRON
 # Alternative: use buildout instead of tox
 #install:
 #    - python bootstrap.py

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -15,6 +15,8 @@ CHANGES
 
 - Add `controls` property to Form class to list all form controls.
 
+- Support Python 3.6, PyPy2.7 an PyPy3.3.
+
 
 5.1 (2017-01-31)
 ----------------

diff --git a/setup.py b/setup.py
@@ -38,10 +38,15 @@
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Zope Public License',
+        'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: Implementation',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Testing',
         'Topic :: Internet :: WWW/HTTP',
     ],

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,14 @@
 [tox]
 envlist =
-    py27,py33,py34,py35,docs,flake8
+    py27,
+    py33,
+    py34,
+    py35,
+    py36,
+    pypy,
+    pypy3,
+    docs,
+    flake8
 
 [testenv]
 deps =