From f9813a6fbef45cfc53925a5b05b40d59c9a79b14 Mon Sep 17 00:00:00 2001
From: Martin Mahner <martin@mahner.org>
Date: Thu, 19 Jan 2017 12:16:20 +0100
Subject: [PATCH] Updated test runners.

---
 .travis.yml |  3 ++-
 CHANGELOG   | 12 ++++++++++++
 setup.py    |  3 +--
 tox.ini     |  4 ++--
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c85e366..f88c526 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,12 @@ language: python
 python:
   - 2.7
   - 3.5
+  - 3.6
 
 env:
   - DJANGO: django>=1.8,<1.9
   - DJANGO: django>=1.9,<1.10
-  - DJANGO: django>=1.10
+  - DJANGO: django>=1.10,<1.11
 
 before_install:
   - pip install codecov
diff --git a/CHANGELOG b/CHANGELOG
index ed13a4b..067c3ff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,18 @@
 Changelog
 =========
 
+2.13a (2017-01-19)
+------------------
+
+* (Backwards incompatible) Removal of django-mptt and therefor the removal of a
+  tree based snippet list, due to performance reasons with large snippet counts.
+  Snippets still have a 'parent' relation if it's an answer of another snippet,
+  however this is no longer a Nested Set. The UI is simplified too and the user
+  can now only compare an answer to it's parent snippet. I believe this is the
+  major use case anyway.
+* (Backwards incompatible) Removal of the "Gist" button feature.
+* Python 3.6 compatibility and tests.
+
 2.12 (2016-09-06)
 -----------------
 
diff --git a/setup.py b/setup.py
index d29d36a..9473aea 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ long_description = u'\n\n'.join((
 
 setup(
     name='dpaste',
-    version='2.12',
+    version='2.13a',
     description='dpaste is a Django based pastebin. It\'s intended to run '
                 'separately but its also possible to be installed into an '
                 'existing Django project like a regular app.',
@@ -51,7 +51,6 @@ setup(
     install_requires=[
         'django>=1.8',
         'pygments>=1.6',
-        'requests>=2.0.0',
     ],
     tests_require=[
         'tox>=1.6.1'
diff --git a/tox.ini b/tox.ini
index b19a3ae..f3f112f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 toxworkdir=/tmp/tox/dpaste
 envlist=
-    py{27,35}-django-{18,19,latest}
+    py{27,36}-django-{18,19,110,111}
 
 [testenv]
 install_command =
@@ -14,4 +14,4 @@ deps=
     # Django versions
     django-18: django>=1.8,<1.9
     django-19: django>=1.9,<1.10
-    django-latest: django>=1.10
+    django-110: django>=1.10,<1.11