From f92242652d17f382de96f78c3a33bdafdda72467 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Sat, 28 Jul 2018 09:06:04 -0300
Subject: [PATCH] Include six as dependency

---
 CHANGELOG.rst | 2 +-
 setup.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 76bf02c..bd08eb6 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,7 +4,7 @@ pytest-xdist 1.22.5 (2018-07-27)
 Bug Fixes
 ---------
 
-- `#321 <https://github.com/pytest-dev/pytest-xdist/issues/321>`_: Revert change that dropped support for ``pytest<3.4``.
+- `#321 <https://github.com/pytest-dev/pytest-xdist/issues/321>`_: Revert change that dropped support for ``pytest<3.4`` and require ``six``.
 
   This change caused problems in some installations, and was a mistaken
   in the first place as we should not change version requirements
diff --git a/setup.py b/setup.py
index becb323..61d9b1b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-install_requires = ['execnet>=1.1', 'pytest>=3.0.0', 'pytest-forked']
+install_requires = ['execnet>=1.1', 'pytest>=3.0.0', 'pytest-forked', "six"]
 
 
 setup(