Merge pull request #131 from sigmavirus24/update-supported-versions

Update supported versions of Python
requests · Jan 20, 2016 · 180f2e3 · 180f2e3
2 parents 35d45ab + 60a89a7
commit 180f2e3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,24 +11,12 @@ notifications:
 
 matrix:
   include:
-  - python: 2.6
-    env: TOXENV=py26
-  - python: 2.6
-    env: TOXENV=py26 REQUESTS_VERSION="===2.2.1"
-  - python: 2.6
-    env: TOXENV=py26 REQUESTS_VERSION="===2.1.0"
   - python: 2.7
     env: TOXENV=py27
   - python: 2.7
     env: TOXENV=py27 REQUESTS_VERSION="===2.2.1"
   - python: 2.7
     env: TOXENV=py27 REQUESTS_VERSION="===2.1.0"
-  - python: 3.2
-    env: TOXENV=py32
-  - python: 3.2
-    env: TOXENV=py32 REQUESTS_VERSION="===2.2.1"
-  - python: 3.2
-    env: TOXENV=py32 REQUESTS_VERSION="===2.1.0"
   - python: 3.3
     env: TOXENV=py33
   - python: 3.3

diff --git a/setup.py b/setup.py
@@ -58,11 +58,11 @@ def get_version():
         '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',
         'Programming Language :: Python :: Implementation :: CPython',
     ],
 )
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py32,py33,py34,pypy,{py27,py34}-flake8,docstrings
+envlist = py27,py33,py34,py35,pypy,{py27,py34}-flake8,docstrings
 
 [testenv]
 pip_pre = False