summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Charriere <nicholascharriere@gmail.com>2017-02-22 16:15:46 -0800
committerGitHub <noreply@github.com>2017-02-22 16:15:46 -0800
commit1db2d1e4fd9a87966a361e16bffc4c55f238a42c (patch)
treec827e572559b6186c05a4715dd50178c917c567c
parentf8137fc4b0d0d5f2fee8b81f5d744e14f9d8dd2e (diff)
parente7edf8cbc04b2bfad279387e754a0c8f84c2c70b (diff)
downloadpymemcache-1db2d1e4fd9a87966a361e16bffc4c55f238a42c.tar.gz
Merge pull request #142 from pinterest/kill-26
Kill python 2.6
-rw-r--r--setup.py1
-rw-r--r--tox.ini2
2 files changed, 1 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 527bb7e..003cc6f 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,6 @@ setup(
url='https://github.com/Pinterest/pymemcache',
classifiers=[
'Programming Language :: Python',
- 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
diff --git a/tox.ini b/tox.ini
index eb1d81a..e1542b8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26, py27, pypy, py33, py34, py35, docs, py27-flake8, py35-flake8, integration
+envlist = py27, pypy, py33, py34, py35, docs, py27-flake8, py35-flake8, integration
skip_missing_interpreters = True
[testenv]