Skip to content

Commit

Permalink
Merge pull request #15 from zopefoundation/drop-py26-py32-support
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 24, 2016
2 parents 1be18cd + 92133dd commit c564507
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ matrix:
- python: 3.5
env: TOXENV=py35
env:
- TOXENV=py26
- TOXENV=py27
- TOXENV=py27-pure
- TOXENV=py32
- TOXENV=py33
- TOXENV=py33-pure
- TOXENV=py34
Expand Down
6 changes: 4 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
Changes
=======

4.0.4 (unreleased)
4.1.0 (unreleased)
------------------

- Claim support for Python 3.5.
- Drop support for Python 2.6 and 3.2.

- Add support for Python 3.5.

4.0.3 (2015-06-02)
------------------
Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def __str__(self):
]

setup(name='zope.security',
version='4.0.4.dev0',
version='4.1.0.dev0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description='Zope Security Framework',
Expand All @@ -122,10 +122,8 @@ def __str__(self):
'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
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
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,pypy,jython,py32,py33,coverage,docs
py26,py27,py27-pure,pypy,py32,py33,py33-pure,py34,py35,coverage,docs
# py27,pypy,jython,py33,coverage,docs
py27,py27-pure,pypy,py33,py33-pure,py34,py35,coverage,docs

[testenv]
deps =
Expand Down Expand Up @@ -31,13 +31,13 @@ setenv =

[testenv:coverage]
basepython =
python2.6
python2.7
commands =
# The installed version messes up nose's test discovery / coverage reporting
# So, we uninstall that from the environment, and then install the editable
# version, before running nosetests.
pip uninstall -y zope.security
python -c "import shutil; shutil.copyfile('src/zope/__init__.py', '{envdir}/lib/python2.6/site-packages/zope/__init__.py')"
python -c "import shutil; shutil.copyfile('src/zope/__init__.py', '{envdir}/lib/python2.7/site-packages/zope/__init__.py')"
pip install -e .
nosetests --with-xunit --with-xcoverage
deps =
Expand Down

0 comments on commit c564507

Please sign in to comment.