Skip to content

Commit

Permalink
Merge pull request #28 from Pylons/drop-py26-py32-add-py35
Browse files Browse the repository at this point in the history
Drop support for Python 2.6/3.2; add support for Python 3.5.
  • Loading branch information
tseaver committed Sep 21, 2016
2 parents 49fb0cc + 0d1a464 commit bc67aec
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Expand Up @@ -2,17 +2,16 @@
language: python

python:
- 2.6
- 2.7
- pypy
- 3.2
- 3.3
- 3.4
- 3.5
- pypy3

install: python setup.py dev
install: python setup.py -q dev

script: python setup.py test -q
script: python setup.py -q test -q

notifications:
email:
Expand Down
4 changes: 3 additions & 1 deletion CHANGES.txt
@@ -1,7 +1,9 @@
Unreleased
----------

- Add explicit support for Python 3.4.
- Drop support for Python 2.6 and 3.2.

- Add explicit support for Python 3.4 and 3.5.

0.7 (2013-06-28)
----------------
Expand Down
9 changes: 4 additions & 5 deletions setup.py
Expand Up @@ -38,20 +38,19 @@
]

setup(name='pyramid_exclog',
version='0.8dev',
version='0.8.dev0',
description=('A package which logs to a Python logger when an '
'exception is raised by a Pyramid application'),
long_description=README + '\n\n' + CHANGES,
classifiers=[
"Intended Audience :: Developers",
"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",
"Framework :: Pyramid",
"Topic :: Internet :: WWW/HTTP :: WSGI",
"License :: Repoze Public License",
Expand All @@ -66,8 +65,8 @@
zip_safe=False,
install_requires=install_requires,
extras_require = {
'testing':testing_extras,
'docs':docs_extras,
'testing': testing_extras,
'docs': docs_extras,
},
test_suite="pyramid_exclog",
entry_points='',
Expand Down
12 changes: 6 additions & 6 deletions tox.ini
@@ -1,18 +1,18 @@
[tox]
envlist =
py26,py27,py32,py33,py34,pypy,cover
py27,py33,py34,py35,pypy,cover

[testenv]
commands =
python setup.py dev
python setup.py test -q
python setup.py -q dev
python setup.py -q test -q

[testenv:cover]
basepython =
python2.6
python2.7
commands =
python setup.py dev
python setup.py nosetests --with-xunit --with-xcoverage
python setup.py -q dev
python setup.py -q nosetests --with-xunit --with-xcoverage
deps =
nosexcover

0 comments on commit bc67aec

Please sign in to comment.