From 759a47bd9f26f038925eee422815666fb1125f2d Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Tue, 5 May 2020 13:34:59 +0000
Subject: [PATCH] Updated from OpenStack Ansible Tests

Change-Id: I62d3b9fea06044856bbb3c9269214a7807b22244
---
 bindep.txt           | 11 ++++-------
 doc/requirements.txt |  5 ++---
 tests/test-ini.yml   |  4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/bindep.txt b/bindep.txt
index ef56cb6..a27fb5d 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -29,9 +29,6 @@ gcc
 git-core          [platform:dpkg platform:suse]
 libssl-dev        [platform:dpkg]
 libffi-dev        [platform:dpkg]
-python2.7         [platform:dpkg]
-python-apt        [platform:dpkg]
-python-dev        [platform:dpkg]
 python3           [platform:dpkg]
 python3-apt       [platform:dpkg]
 python3-dev       [platform:dpkg]
@@ -41,15 +38,15 @@ gcc-c++           [platform:rpm]
 git               [platform:rpm !platform:suse]
 libffi-devel      [platform:rpm]
 openssl-devel     [platform:rpm]
-python-devel      [platform:rpm]
-python2-dnf       [platform:fedora]
+python3-dnf       [platform:fedora]
+python3-devel     [platform:rpm]
 
 # Base requirements for Gentoo
 git               [platform:gentoo]
 
 # For SELinux
-libselinux-python [platform:redhat]
-libsemanage-python [platform:redhat]
+libselinux-python3  [platform:redhat]
+libsemanage-python3 [platform:redhat]
 
 # Required for compressing collected log files in CI
 gzip
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 72bf5aa..1befac6 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -9,9 +9,8 @@
 # openstack-ansible-tests repository. Once it merges there, the changes will
 # automatically be proposed to all the repositories which use it.
 
-sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD
-sphinx>=1.8.0,!=2.1.0;python_version>='3.4'  # BSD
+sphinx>=2.0.0,!=2.1.0  # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
-openstackdocstheme>=1.20.0 # Apache-2.0
+openstackdocstheme>=1.32.1 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
diff --git a/tests/test-ini.yml b/tests/test-ini.yml
index a356237..160964a 100644
--- a/tests/test-ini.yml
+++ b/tests/test-ini.yml
@@ -170,8 +170,8 @@
 - name: Validate output has valueless options printed out
   assert:
     that:
-      - "{{ test_ignore_none_type.content | b64decode | search('(?m)^india$') }}"
-      - "{{ test_ignore_none_type.content | b64decode | search('(?m)^juliett kilo$') }}"
+      - "{{ test_ignore_none_type.content | b64decode is search('(?m)^india$') }}"
+      - "{{ test_ignore_none_type.content | b64decode is search('(?m)^juliett kilo$') }}"
 
 
 # Test enhanced comments