py3: update deps

Drop the now-unnecessary mock lib & reorganize other
test-only libs as dev dependencies.

Pipfile

@@ -5,49 +5,52 @@ verify_ssl = true
 
 [dev-packages]
 kegbot = {editable = true,path = "."}
+black = "*"
+flake8 = "*"
+pytest = "*"
+pytest-django = "*"
+requests-mock = "*"
+sphinx-issues = "*"
+sphinx = "*"
+vcrpy = "*"
 
 [packages]
 celery = "*"
 coloredlogs = "*"
-dj-database-url = "==0.4.2"
+dj-database-url = "*"
 django-bootstrap-pagination = "*"
 django-crispy-forms = "*"
 django-imagekit = "*"
 django-redis = "*"
 django-registration = "*"
-flake8 = "*"
 foursquare = "==1!2016.9.12"
 gunicorn = "*"
 httplib2 = "*"
 isodate = "*"
 jsonfield = "*"
-mock = "==2.0.0"
 oauthlib = "*"
 pilkit = "*"
 protobuf = "*"
 python-gflags = "*"
 pytz = "*"
 redis = "*"
-requests-mock = "*"
 requests-oauthlib = "*"
 requests = "*"
 tweepy = "*"
-vcrpy = "*"
 whitenoise = "*"
 Django = "<3"
 Pillow = "*"
 PyYAML = "*"
 mysqlclient = "*"
-sphinx = "*"
-pytest = "*"
-pytest-django = "*"
 future = "*"
 addict = "*"
 kegbot-api = "*"
-sphinx-issues = "*"
 
 [scripts]
 kegbot = "python bin/kegbot"
 
 [requires]
 python_version = "3"
+
+[pipenv]
+allow_prereleases = true

pykeg/contrib/foursquare/foursquare_test.py

@@ -18,7 +18,7 @@
 
 """Unittests for Foursquare plugin."""
 
-from mock import patch
+from unittest.mock import patch
 
 from django.test import TransactionTestCase
 from django.utils import timezone

pykeg/contrib/untappd/untappd_test.py

@@ -18,7 +18,7 @@
 
 """Unittests for Untappd plugin."""
 
-from mock import patch
+from unittest.mock import patch
 
 from django.test import TransactionTestCase
 from django.utils import timezone

pykeg/core/checkin_test.py

@@ -20,8 +20,7 @@
 
 from django.test import TransactionTestCase
 
-from mock import Mock
-from mock import patch
+from unittest.mock import Mock, patch
 
 from pykeg.core import checkin
 from pykeg.core import models