Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: python
python:
- 2.7
- 3.3
- 3.4
- 3.5
- 3.6
- pypy
services:
- memcached
Expand Down
4 changes: 2 additions & 2 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
* Added testing for Python 3.5 (PR from Tim Graham) #110
* Added testing for Python 3.5 and 3.6 (PR from Tim Graham) #110, #131

* Fixed typos in docstrings (PR from Romuald Brunet, reviewed by Tim
Graham) #105

* Removing Python 2.6 and 3.2 testing (PR from Tim Graham) #115
* Removing Python 2.6, 3.2, and 3.3 testing (PR from Tim Graham) #115, #116

* Removing unnecessary parens in return statements (PR from Tim Graham)
#113
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
])
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
minversion = 1.6
envlist = py27,py33,py34,py35,pypy,pep8
envlist = py27,py34,py35,p36,pypy,pep8
skipsdist = True

[testenv]
Expand Down