diff --git a/.travis.yml b/.travis.yml index fce5e4bd..2a30c0c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,8 @@ matrix: before_install: # Force an upgrade of py & pytest to avoid VersionConflict - pip install --upgrade py - - pip install "pytest>=2.8,<3" + # Faker requires a newer pytest + - pip install "pytest>3.3" - pip install codecov flake8 isort install: - pip install Django${DJANGO} djangorestframework${DRF} diff --git a/requirements-development.txt b/requirements-development.txt index 467dc587..2a46de82 100644 --- a/requirements-development.txt +++ b/requirements-development.txt @@ -3,14 +3,13 @@ django-polymorphic>=2.0 Faker isort mock -pytest>=2.9.0,<3.0 +pytest pytest-django -# factory_boy is currently broken at 2.9 and above. See: https://github.com/pytest-dev/pytest-factoryboy/issues/47 -factory-boy<2.9.0 +factory-boy pytest-factoryboy recommonmark Sphinx sphinx_rtd_theme tox django-debug-toolbar -packaging==16.8 \ No newline at end of file +packaging==16.8 diff --git a/setup.py b/setup.py index 90dc4e6c..c99639a0 100755 --- a/setup.py +++ b/setup.py @@ -105,9 +105,9 @@ def get_package_data(package): setup_requires=pytest_runner + sphinx + wheel, tests_require=[ 'pytest-factoryboy', - 'factory-boy<2.9.0', + 'factory-boy', 'pytest-django', - 'pytest>=2.8,<3', + 'pytest', 'django-polymorphic>=2.0', 'packaging', 'django-debug-toolbar'