From ed2db3d03a71900b02a7ab672087d566f04128ac Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Thu, 21 Dec 2017 10:55:57 +0200
Subject: [PATCH] Drop support for EOL Python 2.6

---
 .travis.yml                  |  1 -
 README.rst                   |  2 +-
 appveyor.yml                 |  1 -
 setup.py                     | 11 ++++++-----
 tox.ini                      |  2 +-
 xdist/scheduler/loadscope.py | 11 +++--------
 6 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index af09393..be060c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ notifications:
   - pytest-commit@python.org
 
 python:
-- '2.6'
 - '2.7'
 - '3.4'
 - '3.5'
diff --git a/README.rst b/README.rst
index 46a61b6..8833888 100644
--- a/README.rst
+++ b/README.rst
@@ -229,7 +229,7 @@ You can also add default environments like this:
 .. code-block:: ini
 
     [pytest]
-    addopts = --tx ssh=myhost//python=python2.5 --tx ssh=myhost//python=python2.6
+    addopts = --tx ssh=myhost//python=python2.5 --tx ssh=myhost//python=python3.6
 
 and then just type::
 
diff --git a/appveyor.yml b/appveyor.yml
index dfb8416..0173af9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,6 @@
 environment:
   matrix:
   # note: please use "tox --listenvs" to populate the build matrix
-  - TOXENV: "py26-pytest30"
   - TOXENV: "py27-pytest30"
   - TOXENV: "py34-pytest30"
   - TOXENV: "py35-pytest30"
diff --git a/setup.py b/setup.py
index 7f8b057..9c2caab 100644
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,7 @@
-from sys import version_info
-
 from setuptools import setup, find_packages
 
 install_requires = ['execnet>=1.1', 'pytest>=3.0.0', 'pytest-forked']
 
-if version_info < (2, 7):
-    install_requires.append('ordereddict')
-
 
 setup(
     name="pytest-xdist",
@@ -27,6 +22,7 @@ setup(
         ],
     },
     zip_safe=False,
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     install_requires=install_requires,
     setup_requires=['setuptools_scm'],
     classifiers=[
@@ -41,6 +37,11 @@ setup(
         'Topic :: Software Development :: Quality Assurance',
         'Topic :: Utilities',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 )
diff --git a/tox.ini b/tox.ini
index 8dca922..17a3138 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 # if you change the envlist, please update .travis.yml file as well
 envlist=
-  py{26,27,34,35,36}-pytest{30,31,32}
+  py{27,34,35,36}-pytest{30,31,32}
   py{27,36}-pytest{30,31,32}-pexpect
   py{27,36}-pytest{master,features}
   flakes
diff --git a/xdist/scheduler/loadscope.py b/xdist/scheduler/loadscope.py
index 4f5e5ff..95a3568 100644
--- a/xdist/scheduler/loadscope.py
+++ b/xdist/scheduler/loadscope.py
@@ -1,14 +1,9 @@
-try:
-    from collections import OrderedDict
-except ImportError:
-    # Support for Python 2.6
-    from ordereddict import OrderedDict
+from collections import OrderedDict
 
-from py.log import Producer
 from _pytest.runner import CollectReport
-
-from xdist.slavemanage import parse_spec_config
+from py.log import Producer
 from xdist.report import report_collection_diff
+from xdist.slavemanage import parse_spec_config
 
 
 class LoadScopeScheduling: