From fe823c32f795acde5292034b37ee5d734cf91479 Mon Sep 17 00:00:00 2001
From: Valerij Maljulin <vmaljuli@redhat.com>
Date: Oct 26 2021 22:11:04 +0000
Subject: [PATCH 1/2] Sphinx before ver.4 for documentation in general requirments


JIRA: RHELWF-3788

---

diff --git a/requirements.txt b/requirements.txt
index de5c8ef..8070f1c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ Flask-Migrate
 stomp.py
 
 # Documentation requirements
-sphinx
+sphinx < 4
 sphinxcontrib-httpdomain
 
 # CLI

From 37ab3894d9010d67dfee419c15e469926a20f25c Mon Sep 17 00:00:00 2001
From: Valerij Maljulin <vmaljuli@redhat.com>
Date: Oct 26 2021 22:12:03 +0000
Subject: [PATCH 2/2] Fix tox documentation building


JIRA: RHELWF-3788

---

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 09d386c..69462e6 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -10,3 +10,5 @@ sphinxcontrib-httpdomain
 prometheus_client
 dogpile.cache
 PyYAML
+# new version of pyparsing is incompatible with httplib2 used by deprecated oath2client used by flask-oidc
+pyparsing < 3
diff --git a/test-requirements.txt b/test-requirements.txt
index 587ff25..f70250a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,3 +5,4 @@ stomp.py
 Flask-Migrate
 six
 python-ldap
+pyparsing < 3
diff --git a/tox.ini b/tox.ini
index 63a9eb0..4719076 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,11 +16,15 @@ commands =
 
 [pytest]
 testpaths = tests/
+deps =
+    -rtest-requirements.txt
 
 [testenv:docs]
 changedir = docs
 deps =
-    -rrequirements.txt
+    -rdocs/requirements.txt
+setenv =
+    DOCS=true
 whitelist_externals =
     mkdir
     rm
@@ -38,7 +42,7 @@ commands =
 [flake8]
 show-source = True
 max-line-length = 100
-exclude = .git,.tox,dist,*egg,env_waiverdb,docs,conf,waiverdb/migrations
+exclude = .git,.tox,dist,*egg,env_waiverdb,docs,conf,waiverdb/migrations,envs,venv
 
 # E124: closing bracket does not match visual indentation
 # W503 line break before binary operator