Even MORE cleanup

.travis.yml

@@ -11,6 +11,8 @@ cache:
   directories:
   - "$HOME/.pip-cache/"
 install:
+- "if [[ $TRAVIS_PYTHON_VERSION == 3.2 ]]; then pip install https://github.com/dcramer/logan/archive/abaf5d49e80446de9e58dcafdcfa8166855a88b9.zip; fi"
+- "if [[ $TRAVIS_PYTHON_VERSION == 3.3 ]]; then pip install https://github.com/dcramer/logan/archive/abaf5d49e80446de9e58dcafdcfa8166855a88b9.zip; fi"
 - pip install --download-cache $HOME/.pip-cache -r requirements-dev.txt
 script:
 - py.test tests/ --cov betty --cov-report term-missing

requirements-dev.txt

@@ -1,6 +1,4 @@
 -r requirements.txt
-httmock==1.2.2
-django-discover-runner
 flake8>=2.0,<2.1
 pytest==2.6.4
 pytest-django==2.8.0

requirements.txt

@@ -1,4 +1,4 @@
-Django>=1.5
+Django>=1.7
 logan==0.5.10
 slimit==0.8.1
 Pillow==2.5.3

setup.py

@@ -19,8 +19,6 @@
 setup_requires = []
 
 dev_requires = [
-    "httmock==1.2.2",
-    "django-discover-runner",
     "flake8>=2.0,<2.1",
     "pytest==2.6.4",
     "pytest-django==2.8.0",
@@ -29,7 +27,7 @@
 ]
 
 install_requires = [
-    "Django>=1.5",
+    "Django>=1.7",
     "six==1.6.1",
     "slimit==0.8.1",
     "jsonfield==0.9.20",

tests/test_api.py

@@ -2,11 +2,6 @@
 import json
 import shutil
 
-
-from django.test import TestCase, Client
-
-from django.contrib.auth.models import User
-
 from betty.conf.app import settings
 from betty.cropper.models import Image
 
@@ -16,12 +11,6 @@
 import pytest
 
 
-class PatchClient(Client):
-    def patch(self, *args, **kwargs):
-        kwargs["REQUEST_METHOD"] = "PATCH"
-        return super(PatchClient, self).post(*args, **kwargs)
-
-
 def test_no_api_key(client):
     res = client.post('/images/api/new')
     assert res.status_code == 403