Skip to content

Commit

Permalink
Add support for Python 3.2, 3.3, and 3.4.
Browse files Browse the repository at this point in the history
  • Loading branch information
tseaver committed Dec 23, 2014
1 parent 9877153 commit 2b45c5b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 18 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ sudo: false
python:
- 2.6
- 2.7
- 3.2
- 3.3
- 3.4
install:
- python bootstrap.py
- bin/buildout
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 @@ Changelog
4.0.0 (Unreleased)
------------------

- Add support for Python 3.2, 3.3, and 3.4.

- Move dependency from ``ZODB3`` -> [``zdaemon``, ``ZODB``, ``ZEO``].
Even though this package doesn't actually import anything from the last
two, the generated instance won't be usable unless the host python
Expand Down
4 changes: 4 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.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",
],
packages=find_packages('src'),
Expand Down
24 changes: 6 additions & 18 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,34 +1,22 @@
[tox]
envlist =
py26,py27,coverage
py26,py27,py32,py33,py34,coverage

[testenv]
deps =
ZODB3 >= 3.9.4
commands =
python setup.py test -q

[testenv:jython]
commands =
jython setup.py test -q

[testenv:py27-pure]
basepython =
python2.7
setenv =
PURE_PYTHON = 1
deps =
{[testenv]deps}
zdaemon
ZODB
ZEO
commands =
python setup.py test -q

[testenv:coverage]
basepython =
python2.6
python2.7
commands =
nosetests --with-xunit --with-xcoverage
deps =
ZODB3 >= 3.9.4
{[testenv]deps}
nose
coverage
nosexcover

0 comments on commit 2b45c5b

Please sign in to comment.