Merge pull request #57 from pinax/django-20

Drop Django <=1.10 support

.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
@@ -17,11 +16,12 @@ common: &common
     - run:
         name: upload coverage report
         command: |
-          if [[ "$TOXENV" != checkqa ]]; then
-              PATH=$HOME/.local/bin:$PATH
-              pip install --user codecov
-              ~/.local/bin/codecov --required --flags $CIRCLE_JOB
-          fi
+           if [[ "$UPLOAD_COVERAGE" != 0 ]]; then
+               PATH=$HOME/.local/bin:$PATH
+               pip install --user codecov
+               coverage xml
+               ~/.local/bin/codecov --required -X search gcov pycov -f coverage.xml --flags $CIRCLE_JOB
+           fi
     - save_cache:
         paths:
           - .tox
@@ -34,39 +34,16 @@ jobs:
   lint:
     <<: *common
     docker:
-      - image: circleci/python:3.6.1
-        environment:
-          TOXENV=checkqa
-  py27dj18:
-    <<: *common
-    docker:
-      - image: circleci/python:2.7
-        environment:
-          TOXENV=py27-dj18
-  py27dj110:
-    <<: *common
-    docker:
-      - image: circleci/python:2.7
+      - image: circleci/python:3.6
         environment:
-          TOXENV=py27-dj110
+          - TOXENV=checkqa
+          - UPLOAD_COVERAGE=0
   py27dj111:
     <<: *common
     docker:
       - image: circleci/python:2.7
         environment:
           TOXENV=py27-dj111
-  py34dj18:
-    <<: *common
-    docker:
-      - image: circleci/python:3.4
-        environment:
-          TOXENV=py34-dj18
-  py34dj110:
-    <<: *common
-    docker:
-      - image: circleci/python:3.4
-        environment:
-          TOXENV=py34-dj110
   py34dj111:
     <<: *common
     docker:
@@ -79,18 +56,6 @@ jobs:
       - image: circleci/python:3.4
         environment:
           TOXENV=py34-dj20
-  py35dj18:
-    <<: *common
-    docker:
-      - image: circleci/python:3.5
-        environment:
-          TOXENV=py35-dj18
-  py35dj110:
-    <<: *common
-    docker:
-      - image: circleci/python:3.5
-        environment:
-          TOXENV=py35-dj110
   py35dj111:
     <<: *common
     docker:
@@ -121,15 +86,9 @@ workflows:
   test:
     jobs:
       - lint
-      - py27dj18
-      - py27dj110
       - py27dj111
-      - py34dj18
-      - py34dj110
       - py34dj111
       - py34dj20
-      - py35dj18
-      - py35dj110
       - py35dj111
       - py35dj20
       - py36dj111

.gitignore

@@ -1,11 +1,45 @@
-build
-dist
-.coverage
-.tox
 MANIFEST
-*.pyc
-*.egg-info
-*.egg
+.DS_Store
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
 docs/_build/
-htmlcov/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
 *.eggs
+.python-version
+
+# Pipfile
+Pipfile
+Pipfile.lock
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# IDEs
+.idea/

AUTHORS

@@ -1,5 +1,6 @@
-James Tauber <jtauber@jtauber.com>
-Luke Hatcher <lukeman@gmail.com>
-Brian Rosner <brosner@gmail.com>
-Patrick Altman <paltman@gmail.com>
-John Salvatore <jsalva@mit.edu>
+James Tauber
+Luke Hatcher
+Brian Rosner
+Patrick Altman
+John Salvatore
+Graham Ullrich

CONTRIBUTING.md

@@ -89,7 +89,7 @@ Here is an example of these rules applied:
     # second set of imports are Django imports with contrib in their own
     # group.
     from django.contrib.auth.models import User
-    from django.core.urlresolvers import reverse
+    from django.urls import reverse
     from django.db import models
     from django.utils import timezone
     from django.utils.translation import ugettext_lazy as _