Skip to content

Commit baea52e

Browse files
authored
Remove factory-boy version constraint. (#408)
* Remove factory-boy version constraint. * Remove constraint on pytest version. It appears that pytest-factoryboy now works with a new version of pytest. * Missed a place where pytest version was constrained. * Force use of a newer pytest.
1 parent 2ef94c7 commit baea52e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ matrix:
3333
before_install:
3434
# Force an upgrade of py & pytest to avoid VersionConflict
3535
- pip install --upgrade py
36-
- pip install "pytest>=2.8,<3"
36+
# Faker requires a newer pytest
37+
- pip install "pytest>3.3"
3738
- pip install codecov flake8 isort
3839
install:
3940
- pip install Django${DJANGO} djangorestframework${DRF}

requirements-development.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ django-polymorphic>=2.0
33
Faker
44
isort
55
mock
6-
pytest>=2.9.0,<3.0
6+
pytest
77
pytest-django
8-
# factory_boy is currently broken at 2.9 and above. See: https://github.com/pytest-dev/pytest-factoryboy/issues/47
9-
factory-boy<2.9.0
8+
factory-boy
109
pytest-factoryboy
1110
recommonmark
1211
Sphinx
1312
sphinx_rtd_theme
1413
tox
1514
django-debug-toolbar
16-
packaging==16.8
15+
packaging==16.8

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ def get_package_data(package):
105105
setup_requires=pytest_runner + sphinx + wheel,
106106
tests_require=[
107107
'pytest-factoryboy',
108-
'factory-boy<2.9.0',
108+
'factory-boy',
109109
'pytest-django',
110-
'pytest>=2.8,<3',
110+
'pytest',
111111
'django-polymorphic>=2.0',
112112
'packaging',
113113
'django-debug-toolbar'

0 commit comments

Comments
 (0)