From 46fa453683d14289434cde7fc807b830d4cc7e0a Mon Sep 17 00:00:00 2001
From: Matt Layman <matthewlayman@gmail.com>
Date: Thu, 1 Feb 2018 09:02:46 -0500
Subject: [PATCH 1/4] Remove factory-boy version constraint.

---
 requirements-development.txt | 5 ++---
 setup.py                     | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/requirements-development.txt b/requirements-development.txt
index 467dc587..feda7d55 100644
--- a/requirements-development.txt
+++ b/requirements-development.txt
@@ -5,12 +5,11 @@ isort
 mock
 pytest>=2.9.0,<3.0
 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..c0b8cd40 100755
--- a/setup.py
+++ b/setup.py
@@ -105,7 +105,7 @@ 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',
         'django-polymorphic>=2.0',

From 920713c83b2bcd9f921b7fafd2e9f398b9c10868 Mon Sep 17 00:00:00 2001
From: Matt Layman <matthewlayman@gmail.com>
Date: Thu, 1 Feb 2018 09:09:33 -0500
Subject: [PATCH 2/4] Remove constraint on pytest version.

It appears that pytest-factoryboy now works with a new version of
pytest.
---
 requirements-development.txt | 2 +-
 setup.py                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements-development.txt b/requirements-development.txt
index feda7d55..2a46de82 100644
--- a/requirements-development.txt
+++ b/requirements-development.txt
@@ -3,7 +3,7 @@ django-polymorphic>=2.0
 Faker
 isort
 mock
-pytest>=2.9.0,<3.0
+pytest
 pytest-django
 factory-boy
 pytest-factoryboy
diff --git a/setup.py b/setup.py
index c0b8cd40..c99639a0 100755
--- a/setup.py
+++ b/setup.py
@@ -107,7 +107,7 @@ def get_package_data(package):
         'pytest-factoryboy',
         'factory-boy',
         'pytest-django',
-        'pytest>=2.8,<3',
+        'pytest',
         'django-polymorphic>=2.0',
         'packaging',
         'django-debug-toolbar'

From ccccb4ed1fcffdf0c7fd8dd66abfa772143206cf Mon Sep 17 00:00:00 2001
From: Matt Layman <matthewlayman@gmail.com>
Date: Thu, 1 Feb 2018 09:15:45 -0500
Subject: [PATCH 3/4] Missed a place where pytest version was constrained.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fce5e4bd..d7e9a7cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ matrix:
 before_install:
   # Force an upgrade of py & pytest to avoid VersionConflict
   - pip install --upgrade py
-  - pip install "pytest>=2.8,<3"
+  - pip install pytest
   - pip install codecov flake8 isort
 install:
   - pip install Django${DJANGO} djangorestframework${DRF}

From 137e0c83a489c29ca062cf23d4bb4ca3bf9c0821 Mon Sep 17 00:00:00 2001
From: Matt Layman <matthewlayman@gmail.com>
Date: Thu, 1 Feb 2018 09:28:52 -0500
Subject: [PATCH 4/4] Force use of a newer pytest.

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d7e9a7cb..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
+  # Faker requires a newer pytest
+  - pip install "pytest>3.3"
   - pip install codecov flake8 isort
 install:
   - pip install Django${DJANGO} djangorestframework${DRF}