Merge pull request #33 from political-memory/fix-deps

Fix deps

.travis.yml

 sudo: false
 language: python
 env:
-- DJANGO="django>1.8,<1.9" DJANGO_SETTINGS_MODULE=representatives.tests.settings
+- DJANGO_SETTINGS_MODULE=representatives.tests.settings
 python:
 - "2.7"
 before_install:
 - pip install codecov
 install:
-- pip install $DJANGO pep8 flake8 pytest-django pytest-cov codecov django-responsediff
-- pip install -e .[api]
+- pip install -e .[api,testing]
 script:
 - pep8 representatives/ --exclude migrations --ignore E128
 - flake8 representatives/ --exclude migrations --ignore E128

representatives/tests/response_fixtures/RepresentativeManagerTest.test_constituencies_api.metadata

+{
+    "status_code": 200
+}
\ No newline at end of file

representatives/tests/response_fixtures/RepresentativeManagerTest.test_constituencies_api/status_code

-200
\ No newline at end of file

representatives/tests/response_fixtures/RepresentativeManagerTest.test_groups_api.metadata

+{
+    "status_code": 200
+}
\ No newline at end of file

representatives/tests/response_fixtures/RepresentativeManagerTest.test_groups_api/status_code

-200
\ No newline at end of file

representatives/tests/response_fixtures/RepresentativeManagerTest.test_mandates_api.metadata

+{
+    "status_code": 200
+}
\ No newline at end of file

representatives/tests/response_fixtures/RepresentativeManagerTest.test_mandates_api/status_code

-200
\ No newline at end of file

representatives/tests/response_fixtures/RepresentativeManagerTest.test_representatives_api.metadata

+{
+    "status_code": 200
+}
\ No newline at end of file

representatives/tests/response_fixtures/RepresentativeManagerTest.test_representatives_api/status_code

-200
\ No newline at end of file

setup.py

@@ -12,13 +12,23 @@ setup(
     license='GPLv3',
     keywords='django government parliament',
     install_requires=[
-        'ijson',
+        'django>=1.8,<1.9',
+        'ijson>=2,<3',
     ],
     extras_require={
         'celery': 'celery',
         'api': [
-            'django-filter',
-            'djangorestframework',
+            'django-filter>=0.13,<0.14',
+            'djangorestframework>=3,<4',
+        ],
+        'testing': [
+            'codecov>=2,<3',
+            'flake8>=2,<3',
+            'pep8>=1,<2',
+            'pytest>=2,<3',
+            'pytest-django>=2,<3',
+            'pytest-cov>=2,<3',
+            'django-responsediff>=0.6,<0.7'
         ]
     },
     entry_points={