Skip to content

Remove factory-boy version constraint. #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 1, 2018
Merged

Remove factory-boy version constraint. #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46fa453
Remove factory-boy version constraint.
mblayman Feb 1, 2018
920713c
Remove constraint on pytest version.
mblayman Feb 1, 2018
ccccb4e
Missed a place where pytest version was constrained.
mblayman Feb 1, 2018
137e0c8
Force use of a newer pytest.
mblayman Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
7 changes: 3 additions & 4 deletions requirements-development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
packaging==16.8
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down