Merge pull request #77 from pinax/django-20-compatibility

Revise testing config

.circleci/config.yml

@@ -17,11 +17,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
@@ -36,7 +37,8 @@ jobs:
     docker:
       - image: circleci/python:3.6.1
         environment:
-          TOXENV=checkqa
+          - TOXENV=checkqa
+          - UPLOAD_COVERAGE=0
   py27dj18:
     <<: *common
     docker:

tox.ini

@@ -8,7 +8,7 @@ inline-quotes = double
 [isort]
 multi_line_output=3
 known_django=django
-known_third_party=
+known_third_party=pinax
 sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 skip_glob=*/pinax/notifications/migrations/*
 
@@ -41,6 +41,7 @@ deps =
     dj110: Django>=1.10,<1.11
     dj111: Django>=1.11,<1.12
     dj20: Django<2.1
+    master: https://github.com/django/django/tarball/master
 
 usedevelop = True
 commands =