From 9700be21320e95ed2cd82230c5b21284fabdd349 Mon Sep 17 00:00:00 2001
From: Graham Ullrich <graham@flyingcracker.com>
Date: Wed, 17 Jan 2018 12:58:58 -0700
Subject: [PATCH] Add django>=1.11 to requirements

Update django-user-accounts requirement for Django 2.0
Update CI config
Improve documentation markup
---
 .circleci/config.yml |  1 -
 MANIFEST.in          |  2 --
 README.md            | 21 +++++++++++++++------
 setup.py             |  5 +++--
 tox.ini              |  2 +-
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7ea2c99..6835999 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,6 @@ common: &common
     - restore_cache:
         keys:
           - v2-deps-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
-          - v2-deps-
     - run:
         name: install dependencies
         command: pip install --user tox
diff --git a/MANIFEST.in b/MANIFEST.in
index 53bf6d8..b44eea6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,3 @@
 include AUTHORS
 include LICENSE
 include README.md
-recursive-include pinax/invitations/static *
-recursive-include pinax/invitations/templates *
diff --git a/README.md b/README.md
index da74300..b7eacfb 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,9 @@ Django \ Python | 2.7 | 3.4 | 3.5 | 3.6
 
 To install pinax-invitations:
 
-    pip install pinax-invitations
+```commandline
+    $ pip install pinax-invitations
+```
 
 Add `pinax.invitations` to your `INSTALLED_APPS` setting:
 
@@ -197,6 +199,7 @@ Adds invites to all users with 0 invites remaining.
 ```python
 manage.py add_invites 10  # Adds 10 new invites to all users with 0 invites remaining
 ```
+
 #### infinite_invites
 
 Gives all users unlimited invites.
@@ -231,7 +234,7 @@ URL: `pinax_invitations:topoff_all`
 
 Returns:
 
-```djangotemplate
+```python
 {
     "inner-fragments": {
         ".invite-total": amount
@@ -247,7 +250,7 @@ URL: `pinax_invitations:topoff_user user.pk`
 
 Returns:
 
-```djangotemplate
+```python
 {
     "html": amount
 }
@@ -261,7 +264,7 @@ URL: `pinax_invitations:addto_all`
 
 Returns:
 
-```djangotemplate
+```python
 {
     "inner-fragments": {
         ".amount-added": amount
@@ -277,7 +280,7 @@ URL: `pinax_invitations:addto_user user.pk`
 
 Returns:
 
-```djangotemplate
+```python
 {
     "inner-fragments": {
         ".html": amount
@@ -296,7 +299,7 @@ URL: `pinax_invitations:invite_stat user.pk`
 
 Returns:
 
-```djangotemplate
+```python
 {
     "html": <rendered pinax/invitations/_invite_stat.html>  # provided by site developer
 }
@@ -305,6 +308,12 @@ Returns:
 
 ## Change Log
 
+### 6.1.1
+
+* Add django>=1.11 to requirements
+* Update CI config
+* Improve documentation markup
+
 ### 6.1.0
 
 * Standardize documentation layout
diff --git a/setup.py b/setup.py
index 6a72602..c8843a9 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-VERSION = "6.1.0"
+VERSION = "6.1.1"
 LONG_DESCRIPTION = """
 .. image:: http://pinaxproject.com/pinax-design/patches/pinax-invitations.svg
     :target: https://pypi.python.org/pypi/pinax-invitations/
@@ -62,8 +62,9 @@
         "invitations": []
     },
     install_requires=[
+        "django>=1.11",
         "django-appconf>=1.0.1",
-        "django-user-accounts>=1.3",
+        "django-user-accounts>=2.0.3",
     ],
     test_suite="runtests.runtests",
     tests_require=[
diff --git a/tox.ini b/tox.ini
index 96420c2..46eeca7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ inline-quotes = double
 [isort]
 multi_line_output=3
 known_django=django
-known_third_party=pinax,account,appconf
+known_third_party=account,appconf,pinax
 sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 include_trailing_comma=True
 skip_glob=**/*/migrations/*