Skip to content

Commit

Permalink
Merge pull request #6 from zopefoundation/add-py35-support
Browse files Browse the repository at this point in the history
Add support for Python 3.5.
  • Loading branch information
tseaver committed Apr 14, 2016
2 parents 8f83bc7 + b59f6ce commit a689cb8
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
language: python
sudo: false
matrix:
include:
- python: 3.5
env: TOXENV=py35
env:
- TOXENV=py27
- TOXENV=pypy
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Changes
4.2.0 (unreleased)
------------------

- Add support for Python 3.5.

- Drop support for Python 2.6.

4.1.0 (2015-05-22)
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ def alltests():
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Natural Language :: English',
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27,pypy,py33,py34,py27-zodb,pypy-zodb,py27-pure-zodb,docs
envlist = py27,pypy,py33,py34,py35,py27-zodb,pypy-zodb,py27-pure-zodb,docs

[testenv]
commands = python setup.py -q test -q
Expand Down Expand Up @@ -35,6 +35,7 @@ basepython =
python2.7
setenv =
PURE_PYTHON = 1
PIP_CACHE_DIR = {envdir}/.cache
deps =
{[testenv]deps}
ZODB
Expand Down

0 comments on commit a689cb8

Please sign in to comment.