From 6394ea99b5871884296de25171c8781c655a8f81 Mon Sep 17 00:00:00 2001
From: Wes Okes <wes.okes@gmail.com>
Date: Mon, 18 Sep 2017 15:12:28 -0400
Subject: [PATCH 1/3] versions

---
 .travis.yml                                 | 4 +++-
 dynamic_initial_data/docs/release_notes.rst | 9 +++++++++
 dynamic_initial_data/version.py             | 2 +-
 setup.py                                    | 5 +++--
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 dynamic_initial_data/docs/release_notes.rst

diff --git a/.travis.yml b/.travis.yml
index 926ae51..436adcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,14 @@ python:
   - '2.7'
   - '3.4'
   - '3.5'
+  - '3.6'
 env:
   global:
     - DB=postgres
   matrix:
-    - DJANGO=">=1.8,<1.9"
     - DJANGO=">=1.9,<1.10"
+    - DJANGO=">=1.10,<1.11"
+    - DJANGO=">=1.11,<2.0"
 install:
   - pip install -q coverage flake8 Django$DJANGO django-nose>=1.4
 before_script:
diff --git a/dynamic_initial_data/docs/release_notes.rst b/dynamic_initial_data/docs/release_notes.rst
new file mode 100644
index 0000000..d51c830
--- /dev/null
+++ b/dynamic_initial_data/docs/release_notes.rst
@@ -0,0 +1,9 @@
+Release Notes
+=============
+
+v0.8.0
+------
+* Add python 3.6 support
+* Drop Django 1.8 support
+* Add Django 1.10 support
+* Add Django 1.11 support
diff --git a/dynamic_initial_data/version.py b/dynamic_initial_data/version.py
index a71c5c7..32a90a3 100644
--- a/dynamic_initial_data/version.py
+++ b/dynamic_initial_data/version.py
@@ -1 +1 @@
-__version__ = '0.7.0'
+__version__ = '0.8.0'
diff --git a/setup.py b/setup.py
index 0ae816b..8348ca4 100644
--- a/setup.py
+++ b/setup.py
@@ -32,6 +32,7 @@ def get_version():
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
@@ -39,8 +40,8 @@ def get_version():
     ],
     license='MIT',
     install_requires=[
-        'django>=1.8',
-        'django-manager-utils>=0.12.0',
+        'Django>=1.9',
+        'django-manager-utils>=0.13.0',
     ],
     tests_require=[
         'psycopg2',

From c3d436e23ea96d5b528c0a1189827999511cb677 Mon Sep 17 00:00:00 2001
From: Wes Okes <wes.okes@gmail.com>
Date: Mon, 18 Sep 2017 15:30:53 -0400
Subject: [PATCH 2/3] management command fix

---
 CONTRIBUTORS                                             | 1 +
 .../management/commands/update_initial_data.py           | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1a84d72..d2eb029 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,3 +1,4 @@
 Josh Marlow @joshmarlow josh.marlow@ambition.com (primary)
 Wes Okes @wesokes wes.okes@gmail.com (primary)
 Wes Kendall @wesleykendall wes.kendall@ambition.com (secondary)
+Cardinal-DeepSea-Blues (https://github.com/Cardinal-DeepSea-Blues)
diff --git a/dynamic_initial_data/management/commands/update_initial_data.py b/dynamic_initial_data/management/commands/update_initial_data.py
index a9f0b8c..289e329 100644
--- a/dynamic_initial_data/management/commands/update_initial_data.py
+++ b/dynamic_initial_data/management/commands/update_initial_data.py
@@ -6,15 +6,14 @@
 
 
 class Command(BaseCommand):
-    option_list = BaseCommand.option_list + (
-        make_option(
+    def add_arguments(self, parser):
+        parser.add_argument(
             '--verbose', action='store_true', dest='verbose', default=False,
             help='Determines if we should display which apps are being updated'
-        ),
-        make_option(
+        )
+        parser.add_argument(
             '--app', dest='app', default=None, help='Updates a single app'
         )
-    )
 
     help = 'Call the InitialData.update_initial_data command for all apps. Use --app to update only one app.'
 

From 302c0230d7b94b54e81ed4b6fa2cc3d8c68787ab Mon Sep 17 00:00:00 2001
From: Wes Okes <wes.okes@gmail.com>
Date: Mon, 18 Sep 2017 15:44:11 -0400
Subject: [PATCH 3/3] flake8

---
 dynamic_initial_data/management/commands/update_initial_data.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dynamic_initial_data/management/commands/update_initial_data.py b/dynamic_initial_data/management/commands/update_initial_data.py
index 289e329..4eee3d7 100644
--- a/dynamic_initial_data/management/commands/update_initial_data.py
+++ b/dynamic_initial_data/management/commands/update_initial_data.py
@@ -1,5 +1,3 @@
-from optparse import make_option
-
 from django.core.management.base import BaseCommand
 
 from dynamic_initial_data.base import InitialDataUpdater