Skip to content

Commit eec9b26

Browse files
Merge pull request #45 from chopdgd/pyup-scheduled-update-2018-08-13
Scheduled weekly dependency update for week 32
2 parents 94261ef + b9dd39f commit eec9b26

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ nosetests.xml
2929
htmlcov
3030
.cache
3131
testing.db
32+
.pytest_cache
3233

3334
# Translations
3435
*.mo

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44
djangorestframework==3.8.2
55

6-
django-filter==1.1.0
7-
django-genomix==0.6.2
6+
django-filter==2.0.0
7+
django-genomix==0.6.3
88
django-model-utils==3.1.2

requirements_dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ bumpversion==0.5.3
22
wheel==0.31.1
33

44
# Docs requirements
5-
Sphinx==1.7.4
6-
sphinx-rtd-theme==0.3.1
5+
Sphinx==1.7.6
6+
sphinx-rtd-theme==0.4.1
77
sphinxcontrib-napoleon==0.6.1

requirements_test.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
coverage==4.5.1
22
mock==2.0.0
33
flake8==3.5.0
4-
tox==3.0.0
4+
tox==3.2.1
55
codecov==2.0.15
66

77

88
# Additional test requirements go here
99

10-
pytest==3.6.0
10+
pytest==3.7.1
1111
pytest-cov==2.5.1
12-
pytest-django==3.2.1
12+
pytest-django==3.3.3
1313
pytest-sugar==0.9.1
1414
django-coverage-plugin==1.5.0
15-
django-test-plus==1.0.22
16-
model-mommy==1.5.1
15+
django-test-plus==1.1.1
16+
model-mommy==1.6.0

tests/fixtures.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,14 @@ def Tag():
4343
@pytest.fixture
4444
def Comment():
4545

46+
Activity(content_type='comment')
47+
4648
return mommy.make(
4749
'user_activities.Comment',
4850
id=1,
4951
user=mommy.make('auth.User', id=1, username='username'),
5052
text='text',
5153
active=True,
52-
activities=[Activity(content_type='comment')],
5354
content_type=ContentType.objects.get(model='comment'),
5455
object_id=1,
5556
)
@@ -58,13 +59,14 @@ def Comment():
5859
@pytest.fixture
5960
def Review():
6061

62+
Activity(content_type='review')
63+
6164
return mommy.make(
6265
'user_activities.Review',
6366
id=1,
6467
user=mommy.make('auth.User', id=1, username='username'),
6568
text='text',
6669
active=True,
67-
activities=[Activity(content_type='review')],
6870
rating=Rating(),
6971
content_type=ContentType.objects.get(model='review'),
7072
object_id=1,

0 commit comments

Comments
 (0)