From f3e0b05440a28a3d3a55586222d9406681f3b7c7 Mon Sep 17 00:00:00 2001
From: Santos Gallegos <santos_g@outlook.com>
Date: Tue, 1 Oct 2019 19:47:04 -0500
Subject: [PATCH 1/4] Update pytest

This also moves the conftest.py file to a module,
this is the recommend way https://docs.pytest.org/en/latest/pythonpath.html#pythonpath
And fix some problems with tests on the corporate site.
---
 conftest.py => readthedocs/conftest.py |  1 -
 requirements/testing.txt               | 11 +++--------
 2 files changed, 3 insertions(+), 9 deletions(-)
 rename conftest.py => readthedocs/conftest.py (98%)

diff --git a/conftest.py b/readthedocs/conftest.py
similarity index 98%
rename from conftest.py
rename to readthedocs/conftest.py
index 75e70a89315..73ade3107d0 100644
--- a/conftest.py
+++ b/readthedocs/conftest.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import pytest
 from django.conf import settings
 from rest_framework.test import APIClient
diff --git a/requirements/testing.txt b/requirements/testing.txt
index ad507f71188..7b2661f8d70 100644
--- a/requirements/testing.txt
+++ b/requirements/testing.txt
@@ -2,14 +2,9 @@
 -r local-docs-build.txt
 
 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 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.27 requires pytest >4.1
-pytest-xdist==1.27.0  # pyup: ignore
+pytest==5.2.0  # pyup: <4.2
+pytest-django==3.5.1  # pyup: <3.4.7
+pytest-xdist==1.30.0  # pyup: ignore
 pytest-cov==2.7.1
 apipkg==1.5
 execnet==1.7.1

From 47a75336daf50b0073654b1689da85581f7dd237 Mon Sep 17 00:00:00 2001
From: Santos Gallegos <santos_g@outlook.com>
Date: Tue, 1 Oct 2019 19:49:21 -0500
Subject: [PATCH 2/4] Remove pyup constrains

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

diff --git a/requirements/testing.txt b/requirements/testing.txt
index 7b2661f8d70..5a0283621ec 100644
--- a/requirements/testing.txt
+++ b/requirements/testing.txt
@@ -2,9 +2,9 @@
 -r local-docs-build.txt
 
 django-dynamic-fixture==2.0.0
-pytest==5.2.0  # pyup: <4.2
-pytest-django==3.5.1  # pyup: <3.4.7
-pytest-xdist==1.30.0  # pyup: ignore
+pytest==5.2.0
+pytest-django==3.5.1
+pytest-xdist==1.30.0
 pytest-cov==2.7.1
 apipkg==1.5
 execnet==1.7.1

From d4eeb1a61c476d7af38b4672c8a36c51b9ee25c7 Mon Sep 17 00:00:00 2001
From: Santos Gallegos <santos_g@outlook.com>
Date: Tue, 1 Oct 2019 20:38:01 -0500
Subject: [PATCH 3/4] Linter

---
 readthedocs/conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readthedocs/conftest.py b/readthedocs/conftest.py
index 73ade3107d0..03c028c71ef 100644
--- a/readthedocs/conftest.py
+++ b/readthedocs/conftest.py
@@ -1,7 +1,7 @@
 import pytest
-from django.conf import settings
 from rest_framework.test import APIClient
 
+
 try:
     # TODO: this file is read/executed even when called from ``readthedocsinc``,
     # so it's overriding the options that we are defining in the ``conftest.py``

From c77ded9f2bea1c58e48e0bda0147da24bd88f452 Mon Sep 17 00:00:00 2001
From: Santos Gallegos <santos_g@outlook.com>
Date: Wed, 2 Oct 2019 10:34:31 -0500
Subject: [PATCH 4/4] Update submodule

---
 common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common b/common
index a7af72b7e59..bc413ae5338 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a7af72b7e5946d62fd3b4dc524d6406604488f6f
+Subproject commit bc413ae53380dbb9902c75c6c22ea5b67b1b0d2b