Skip to content

Commit

Permalink
Merge branch 'feature/removepy32'
Browse files Browse the repository at this point in the history
  • Loading branch information
digitalresistor committed Jan 28, 2016
2 parents db1b41d + e4bd5a5 commit 5200265
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ matrix:
env: TOXENV=py26
- python: 2.7
env: TOXENV=py27
- python: 3.2
env: TOXENV=py32
- python: 3.3
env: TOXENV=py33
- python: 3.4
Expand Down
5 changes: 5 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Unreleased
----------

Compatibility
~~~~~~~~~~~~~

- Python 3.2 is no longer supported by WebOb

Bugfix
~~~~~~

Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
name='WebOb',
version='1.6.0a0',
description="WSGI request and response object",
long_description=README + '\n\n' + CHANGES,
long_description=README + '\n\n' + CHANGES,
classifiers=[
"Development Status :: 6 - Mature",
"Intended Audience :: Developers",
Expand All @@ -35,7 +35,6 @@
"Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3.2",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
Expand All @@ -52,7 +51,7 @@
zip_safe=True,
test_suite='nose.collector',
tests_require=['nose'],
extras_require = {
extras_require={
'testing': testing_extras,
'docs': docs_extras,
},
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py26,py27,py32,py33,py34,py35,pypy,pypy3,
py26,py27,py33,py34,py35,pypy,pypy3,
docs,{py2,py3}-cover,coverage

[testenv]
Expand All @@ -9,7 +9,6 @@ envlist =
basepython =
py26: python2.6
py27: python2.7
py32: python3.2
py33: python3.3
py34: python3.4
py35: python3.5
Expand Down

0 comments on commit 5200265

Please sign in to comment.