Merge pull request #45 from chopdgd/pyup-scheduled-update-2018-08-13

Scheduled weekly dependency update for week 32

Author: genomics-geek

.gitignore

@@ -29,6 +29,7 @@ nosetests.xml
 htmlcov
 .cache
 testing.db
+.pytest_cache
 
 # Translations
 *.mo

requirements.txt

@@ -3,6 +3,6 @@
 
 djangorestframework==3.8.2
 
-django-filter==1.1.0
-django-genomix==0.6.2
+django-filter==2.0.0
+django-genomix==0.6.3
 django-model-utils==3.1.2

requirements_dev.txt

@@ -2,6 +2,6 @@ bumpversion==0.5.3
 wheel==0.31.1
 
 # Docs requirements
-Sphinx==1.7.4
-sphinx-rtd-theme==0.3.1
+Sphinx==1.7.6
+sphinx-rtd-theme==0.4.1
 sphinxcontrib-napoleon==0.6.1

requirements_test.txt

@@ -1,16 +1,16 @@
 coverage==4.5.1
 mock==2.0.0
 flake8==3.5.0
-tox==3.0.0
+tox==3.2.1
 codecov==2.0.15
 
 
 # Additional test requirements go here
 
-pytest==3.6.0
+pytest==3.7.1
 pytest-cov==2.5.1
-pytest-django==3.2.1
+pytest-django==3.3.3
 pytest-sugar==0.9.1
 django-coverage-plugin==1.5.0
-django-test-plus==1.0.22
-model-mommy==1.5.1
+django-test-plus==1.1.1
+model-mommy==1.6.0

tests/fixtures.py

@@ -43,13 +43,14 @@ def Tag():
 @pytest.fixture
 def Comment():
 
+    Activity(content_type='comment')
+
     return mommy.make(
         'user_activities.Comment',
         id=1,
         user=mommy.make('auth.User', id=1, username='username'),
         text='text',
         active=True,
-        activities=[Activity(content_type='comment')],
         content_type=ContentType.objects.get(model='comment'),
         object_id=1,
     )
@@ -58,13 +59,14 @@ def Comment():
 @pytest.fixture
 def Review():
 
+    Activity(content_type='review')
+
     return mommy.make(
         'user_activities.Review',
         id=1,
         user=mommy.make('auth.User', id=1, username='username'),
         text='text',
         active=True,
-        activities=[Activity(content_type='review')],
         rating=Rating(),
         content_type=ContentType.objects.get(model='review'),
         object_id=1,