Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e840438

Browse files
committed
Add django-polymorphic as test dependency
pytest-factoryboy does not support pytest3.0+
1 parent d565334 commit e840438

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ env:
2626

2727
- DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
2828
before_install:
29-
# Force an upgrade of py to avoid VersionConflict
29+
# Force an upgrade of py & pytest to avoid VersionConflict
3030
- pip install --upgrade py
31+
- pip install "pytest>=2.8,<3"
3132
- pip install codecov
3233
install:
3334
- pip install Django${DJANGO} djangorestframework${DRF}

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ def get_package_data(package):
105105
tests_require=[
106106
'pytest-factoryboy',
107107
'pytest-django',
108-
'pytest>=2.8',
108+
'pytest>=2.8,<3',
109+
'django-polymorphic',
109110
] + mock,
110111
zip_safe=False,
111112
)

0 commit comments

Comments
 (0)