Skip to content

Commit

Permalink
Merge pull request #29 from zopefoundation/drop-py26-py32
Browse files Browse the repository at this point in the history
Drop support for Python 2.6 and 3.2.
  • Loading branch information
tseaver committed Mar 26, 2016
2 parents c9b88e6 + b36dcab commit 92cc2cc
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
language: python
sudo: false
python:
- 2.6
- 2.7
- 3.2
- 3.3
- 3.4
- 3.5
Expand All @@ -12,6 +10,6 @@ python:
install:
- pip install .
script:
- python setup.py test -q
- python setup.py -q test -q
notifications:
email: false
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
4.3.0 (TBD)
-----------

- Drop support for Python 2.6 and 3.2.

- The pure-Python implementation, used on PyPy and when a C compiler
isn't available for CPython, now pickles identically to the C
version. Unpickling will choose the best available implementation.
Expand Down
2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,8 @@ def BTreeExtension(family):
"License :: OSI Approved :: Zope Public License",
"Programming Language :: Python",
'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 :: 3.5',
Expand Down
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
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,py34,py35,pypy3,w_zodb,coverage,docs
# py27,jython,pypy,coverage,docs
py27,py27-pure,pypy,py33,py34,py35,pypy3,w_zodb,coverage,docs

[testenv]
deps =
zope.interface
persistent
transaction
commands =
python setup.py test -q
python setup.py -q test -q

[testenv:py27-pure]
basepython =
Expand All @@ -21,7 +21,7 @@ setenv =
deps =
{[testenv]deps}
commands =
python setup.py test -q
python setup.py -q test -q

#[testenv:jython]
#commands =
Expand All @@ -31,7 +31,7 @@ commands =
basepython =
python2.7
commands =
python setup.py test -q
python setup.py -q test -q
deps =
zope.interface
persistent
Expand Down

0 comments on commit 92cc2cc

Please sign in to comment.