From c7692f5c56ad3bfccf5d6390ff2011e298fc9051 Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Wed, 16 Nov 2022 11:38:03 -0500
Subject: [PATCH] Pinning pyparsing due to testing issues

---
 requirements/requirements.in  | 2 +-
 requirements/requirements.txt | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/requirements/requirements.in b/requirements/requirements.in
index c8ca33d4d5..174dafe68e 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -40,7 +40,7 @@ psycopg2
 psutil
 pygerduty
 pyjwt>=2.4.0 # https://github.com/ansible/awx/security/dependabot/58
-pyparsing
+pyparsing==2.4.6  # Upgrading to v3 of pyparsing introduce errors on smart host filtering: Expected 'or' term, found 'or'  (at char 15), (line:1, col:16)
 python3-saml==1.13.0
 python-dsv-sdk
 python-tss-sdk==1.0.0
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index a04ed90cce..f78eae78ef 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -123,6 +123,7 @@ django-pglocks==1.0.4
     # via -r /awx_devel/requirements/requirements.in
 django-polymorphic==3.1.0
     # via -r /awx_devel/requirements/requirements.in
+    # via -r /awx_devel/requirements/requirements_git.txt
 django-redis==5.2.0
     # via -r /awx_devel/requirements/requirements.in
 django-solo==2.0.0
@@ -292,7 +293,7 @@ pyjwt==2.6.0
     #   twilio
 pyopenssl==22.1.0
     # via twisted
-pyparsing==3.0.9
+pyparsing==2.4.6
     # via
     #   -r /awx_devel/requirements/requirements.in
     #   packaging
@@ -416,7 +417,7 @@ tempora==5.0.2
     #   jaraco-logging
 tomli==2.0.1
     # via setuptools-scm
-twilio==7.15.1
+twilio==7.15.2
     # via -r /awx_devel/requirements/requirements.in
 twisted[tls]==22.10.0
     # via