Release prep (#80)

* greenkeeper

* simplify tox deps

* add missing travisci coverage

* update docker demos

* standardize django version comments

Author: crccheck

.travis.yml

@@ -16,6 +16,8 @@ env:
   - TOX_ENV=django19-py35
   - TOX_ENV=django110-py27
   - TOX_ENV=django110-py35
+  - TOX_ENV=django111-py27
+  - TOX_ENV=django111-py35
   - TOX_ENV=coveralls-django110-py35
 install: pip install tox coveralls
 script: tox -e $TOX_ENV

Makefile

@@ -46,23 +46,24 @@ resetdb: ## Delete and then recreate the dev sqlite database
 
 .PHONY: build
 build: ## Build a full set of Docker images
-build: build/1.9.2 build/1.8.9 build/1.7.11 build/1.6.11 build/1.5.12
+build: build/1.11.1 build/1.10.7 build/1.9.13 build/1.8.18 build/1.7.11 build/1.6.11
 
 build/%:
 	docker build --build-arg DJANGO_VERSION=$* \
 	  -t $(IMAGE):$$(echo "$*" | cut -f 1-2 -d.) .
 
-run: run/1.9
+run: run/1.11
 
 run/%:
 	docker run --rm -p 8000:8000 -it $(IMAGE):$*
 
 docker/publish: ## Publish Docker images to the hub
+	docker push $(IMAGE):1.11
+	docker push $(IMAGE):1.10
 	docker push $(IMAGE):1.9
 	docker push $(IMAGE):1.8
 	docker push $(IMAGE):1.7
 	docker push $(IMAGE):1.6
-	docker push $(IMAGE):1.5
 
 test/%:
 	docker run --rm -p 8000:8000 -t $(IMAGE):$* make test

django_object_actions/tests/test_admin.py

@@ -9,7 +9,7 @@
 try:
     from django.urls import reverse
 except ImportError:
-    from django.core.urlresolvers import reverse  # < django 1.10
+    from django.core.urlresolvers import reverse  # < DJANGO1.10
 
 from .tests import LoggedInTestCase
 from example_project.polls.factories import CommentFactory, PollFactory

django_object_actions/tests/tests.py

@@ -1,7 +1,7 @@
 try:
     from django.urls import reverse
 except ImportError:
-    from django.core.urlresolvers import reverse  # < django 1.10
+    from django.core.urlresolvers import reverse  # < DJANGO1.10
 from django.test import TestCase
 
 from example_project.polls.factories import UserFactory

example_project/polls/admin.py

@@ -8,7 +8,7 @@
 try:
     from django.urls import reverse
 except ImportError:
-    from django.core.urlresolvers import reverse  # < django 1.10
+    from django.core.urlresolvers import reverse  # < DJANGO1.10
 
 from django_object_actions import (
     DjangoObjectActions, takes_instance_or_queryset)

requirements.txt

@@ -1,7 +1,7 @@
-dj-database-url==0.4.1
+dj-database-url==0.4.2
 # Can upgrade once we lose DJANGO1.7
 django-extensions==1.6.7
 factory-boy==2.8.1
-faker==0.7.7
-coverage==4.2
+Faker==0.7.11
+coverage==4.4
 mock==2.0.0

tox.ini

@@ -24,7 +24,7 @@ deps =
     django18: Django<1.9
     django19: Django<1.10
     django110: Django<1.11
-    django111: Django>=1.11rc1,<2.0
+    django111: Django<1.12
 
 [testenv:coveralls-django110-py35]
 commands =