summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGael Pasgrimaud <gael@gawel.org>2016-09-15 09:21:25 +0200
committerGael Pasgrimaud <gael@gawel.org>2016-09-15 09:21:25 +0200
commit59d678aa8807eb393cc71b755493b351c5bf5fb8 (patch)
tree38d15bcb25d420c68dac3ea6c45d25e329823467
parent0c7ed5aafb6c7fd066a96de4a98c7fc0608a4444 (diff)
parentd4323df046ce1ed4694fdd49f2abd7008fb016ae (diff)
downloadwebtest-form_charset.tar.gz
Merge branch 'master' into form_charsetform_charset
-rw-r--r--CHANGELOG.rst2
-rw-r--r--setup.py1
2 files changed, 1 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 471c4da..4a3aa31 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,7 +4,7 @@ News
2.0.24 (unreleased)
-------------------
-- Nothing changed yet.
+- Drop python 2.6 support. Newer versions may still work if you use waitress < 1.0
2.0.23 (2016-07-21)
diff --git a/setup.py b/setup.py
index 2906030..06d8e8f 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,6 @@ setup(name='WebTest',
"Topic :: Internet :: WWW/HTTP :: WSGI",
"Topic :: Internet :: WWW/HTTP :: WSGI :: Server",
"Programming Language :: Python :: 2",
- "Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.3",