From 084935418e33a736bedc6c5774ab79af297cfd92 Mon Sep 17 00:00:00 2001
From: Santos Gallegos <santos_g@outlook.com>
Date: Thu, 14 Feb 2019 17:57:38 -0500
Subject: [PATCH 1/4] Downgrade test requirements

For some reason this makes test to fail in the corporate site.
We should investigate the root cause, but in the meantime downgrading
works.
---
 requirements/testing.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements/testing.txt b/requirements/testing.txt
index 671bd8775f0..989afc1afb5 100644
--- a/requirements/testing.txt
+++ b/requirements/testing.txt
@@ -2,8 +2,8 @@
 -r local-docs-build.txt
 
 django-dynamic-fixture==2.0.0
-pytest==4.2.0
-pytest-django==3.4.7
+pytest==4.1.1
+pytest-django==3.4.5
 pytest-xdist==1.26.1
 pytest-cov==2.6.1
 apipkg==1.5

From ccc54404a815752b102eba9bd909302b824e5218 Mon Sep 17 00:00:00 2001
From: Santos Gallegos <santos_g@outlook.com>
Date: Thu, 14 Feb 2019 18:26:59 -0500
Subject: [PATCH 2/4] Downgrade only django-pytest

---
 requirements/testing.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/requirements/testing.txt b/requirements/testing.txt
index 989afc1afb5..eda5a0f0f71 100644
--- a/requirements/testing.txt
+++ b/requirements/testing.txt
@@ -2,8 +2,9 @@
 -r local-docs-build.txt
 
 django-dynamic-fixture==2.0.0
-pytest==4.1.1
-pytest-django==3.4.5
+pytest==4.2.1
+# pytest-django 3.4.7 break our tests
+pytest-django==3.4.6 # pyup: <3.4.7
 pytest-xdist==1.26.1
 pytest-cov==2.6.1
 apipkg==1.5

From 0502b433568c77b854a68fd5a2afbcece5b4dd4f Mon Sep 17 00:00:00 2001
From: Santos Gallegos <santos_g@outlook.com>
Date: Thu, 14 Feb 2019 19:17:28 -0500
Subject: [PATCH 3/4] The final combination

---
 requirements/testing.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements/testing.txt b/requirements/testing.txt
index eda5a0f0f71..7ef1bd20d93 100644
--- a/requirements/testing.txt
+++ b/requirements/testing.txt
@@ -2,7 +2,8 @@
 -r local-docs-build.txt
 
 django-dynamic-fixture==2.0.0
-pytest==4.2.1
+# pytest 4.2 is incompatible with pytest-django 3.4.6
+pytest==4.1.1  # pyup: <4.2
 # pytest-django 3.4.7 break our tests
 pytest-django==3.4.6 # pyup: <3.4.7
 pytest-xdist==1.26.1

From a4430fd78b84cf0684f0222167a36b808dbf95f0 Mon Sep 17 00:00:00 2001
From: Santos Gallegos <santos_g@outlook.com>
Date: Mon, 18 Feb 2019 20:12:29 -0500
Subject: [PATCH 4/4] Comment

---
 requirements/testing.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/requirements/testing.txt b/requirements/testing.txt
index 7ef1bd20d93..87116f1f67b 100644
--- a/requirements/testing.txt
+++ b/requirements/testing.txt
@@ -4,8 +4,10 @@
 django-dynamic-fixture==2.0.0
 # pytest 4.2 is incompatible with pytest-django 3.4.6
 pytest==4.1.1  # pyup: <4.2
-# pytest-django 3.4.7 break our tests
-pytest-django==3.4.6 # pyup: <3.4.7
+# pytest-django 3.4.7 break our tests from corporate site
+# probably a bug related to overriding django settings in
+# previous tests
+pytest-django==3.4.6  # pyup: <3.4.7
 pytest-xdist==1.26.1
 pytest-cov==2.6.1
 apipkg==1.5