From b3be239061e1e2015987487b46f77382038209ad Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Fri, 19 Jun 2015 08:14:25 +0000
Subject: [PATCH 1/3] Fix merge conflicts between #486 and #510 (pip install
 .).

---
 docs/using.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/using.rst b/docs/using.rst
index a180a3826..bb27ad8c2 100644
--- a/docs/using.rst
+++ b/docs/using.rst
@@ -35,8 +35,8 @@ In general:
   .. _new-swig:
   .. note:: If your operating system uses SWIG 3.0.5+, you will need
             to run ``pip install -r requirements-swig-3.0.5.txt -r
-            requirements.txt`` instead of the standard ``pip
-            install -r requirements.txt``.
+            requirements.txt .`` instead of the standard ``pip
+            install -r requirements.txt .``.
 
 * `Augeas`_ is required for the Python bindings
 
@@ -95,7 +95,7 @@ backslash):
 .. code-block:: shell
 
    SWIG_FEATURES="-includeall -D__`uname -m`__-I/usr/include/openssl" \
-   ./venv/bin/pip install -r requirements.txt functools32
+   ./venv/bin/pip install -r requirements.txt functools32 .
 
 
 Installation

From ed7ba282119cdb592b1e9e11d2d51bc2adbda7a8 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Fri, 19 Jun 2015 07:36:45 +0000
Subject: [PATCH 2/3] Pin jsonschema (quickfix for missing functools32).

https://github.com/Julian/jsonschema/issues/233
---
 docs/using.rst | 2 +-
 setup.py       | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/using.rst b/docs/using.rst
index bb27ad8c2..e377e74ab 100644
--- a/docs/using.rst
+++ b/docs/using.rst
@@ -95,7 +95,7 @@ backslash):
 .. code-block:: shell
 
    SWIG_FEATURES="-includeall -D__`uname -m`__-I/usr/include/openssl" \
-   ./venv/bin/pip install -r requirements.txt functools32 .
+   ./venv/bin/pip install -r requirements.txt .
 
 
 Installation
diff --git a/setup.py b/setup.py
index ebcc2c9b3..46f53244c 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ install_requires = [
     'argparse',
     'ConfigArgParse',
     'configobj',
-    'jsonschema',
+    'jsonschema<2.5.1',  # https://github.com/Julian/jsonschema/issues/233
     'mock',
     'ndg-httpsclient',  # urllib3 InsecurePlatformWarning (#304)
     'parsedatetime',
@@ -53,7 +53,6 @@ install_requires = [
     # order of items in install_requires DOES matter and M2Crypto has
     # to go last, see #152
     'M2Crypto',
-    'functools32'
 ]
 
 dev_extras = [

From 6d2c81138e5ffd4d0102ec0595a0184d6063e109 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Fri, 19 Jun 2015 07:38:05 +0000
Subject: [PATCH 3/3] Revert "Remove support for python2.6"

This reverts commit dee1b7f04921aa5b6e193f20681ef1883db09046.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 9169a32d7..167d6ad74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ after_success: '[ "$TOXENV" == "cover" ] && coveralls'
 # matrix, which allows us to clearly distinguish which component under
 # test has failed
 env:
+  - TOXENV=py26
   - TOXENV=py27
   - TOXENV=lint
   - TOXENV=cover