From cca76538397b553a6ac9a66637a8e28dc8bb45f7 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 2 Jan 2018 14:47:07 +0000
Subject: [PATCH] Specify django-taggit 0.22.2 for Django 2.0 support

---
 setup.py | 2 +-
 tox.ini  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 1f18b4c58..37a0c7970 100755
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ except ImportError:
 install_requires = [
     "Django>=1.11,<2.1",
     "django-modelcluster>=4.0,<5.0",
-    "django-taggit>=0.20,<1.0",
+    "django-taggit>=0.22.2,<1.0",
     "django-treebeard>=4.2.0,<5.0",
     "djangorestframework>=3.1.3,<4.0",
     "Pillow>=2.6.1,<5.0",
diff --git a/tox.ini b/tox.ini
index 2608a2c3d..5a75eb82c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,7 +42,6 @@ deps =
     dj111: Django>=1.11b1,<2.0
     dj111-mssql: django-pyodbc-azure==1.11.0.0
     dj20: Django>=2.0,<2.1
-    dj20: git+https://github.com/alex/django-taggit.git
     postgres: psycopg2>=2.6
     mysql: mysqlclient==1.3.6
     elasticsearch2: elasticsearch>=2,<3