From 0c97888bcb30e463a728d4bea86be8028b659e83 Mon Sep 17 00:00:00 2001
From: John Dickinson <me@not.mn>
Date: Fri, 14 Sep 2018 17:44:38 -0600
Subject: [PATCH] fixed a manpage and added the manpage syntax checker to pep8
 jobs

also a drive-by fix to the bindep job--it doesn't need to install

Change-Id: Ic9b68bc60bfbf21b45a1b7f9d7ff9998e01ddd26
---
 .zuul.yaml                 | 8 ++++++--
 bindep.txt                 | 2 ++
 doc/manpages/swift-recon.1 | 2 +-
 tox.ini                    | 3 +++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 3fbd4567cb..357d6e830c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -277,7 +277,9 @@
               - ^test/(functional|probe)/.*$
         - openstack-tox-pep8:
             irrelevant-files:
-              - ^(api-ref|doc|etc|examples|releasenotes)/.*$
+              - ^(api-ref|etc|examples|releasenotes)/.*$
+              # Keep doc/manpages -- we want to syntax check them
+              - ^doc/(requirements.txt|(saio|s3api|source)/.*)$
     gate:
       jobs:
         # For gate jobs, err towards running more jobs (so, generally avoid
@@ -311,7 +313,9 @@
         - openstack-tox-lower-constraints
         - openstack-tox-pep8:
             irrelevant-files:
-              - ^(api-ref|doc|etc|examples|releasenotes)/.*$
+              - ^(api-ref|etc|examples|releasenotes)/.*$
+              # Keep doc/manpages -- we want to syntax check them
+              - ^doc/(requirements.txt|(saio|s3api|source)/.*)$
     experimental:
       jobs:
         - swift-tox-py27-centos-7
diff --git a/bindep.txt b/bindep.txt
index 1dbb87c1a5..562f8b7e59 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -36,3 +36,5 @@ openssl-dev [platform:apk]
 libopenssl-devel [platform:suse]
 py-cffi [platform:apk]
 musl-dev [platform:apk]
+man-db [pep8]
+man [platform:rpm pep8]
diff --git a/doc/manpages/swift-recon.1 b/doc/manpages/swift-recon.1
index 40be51ea79..c5a30b6d47 100644
--- a/doc/manpages/swift-recon.1
+++ b/doc/manpages/swift-recon.1
@@ -129,7 +129,7 @@ cronjob to run the swift-recon-cron script periodically:
 More documentation about OpenStack Swift can be found at
 .BI https://docs.openstack.org/swift/latest/
 Also more specific documentation about swift-recon can be found at
-.BI https://docs.openstack.org/swift/latest/admin_guide.html#cluster-telemetry-and-monitoring
+.BI https://docs.openstack.org/swift/latest/admin_guide.html\#cluster-telemetry-and-monitoring
 
 
 
diff --git a/tox.ini b/tox.ini
index 69152b867f..d728f888ed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -69,6 +69,7 @@ commands =
   flake8 --filename=swift* bin
   bandit -c bandit.yaml -r swift -n 5
   python ./setup.py check --restructuredtext --strict
+  ./.manpages {posargs}
 
 [testenv:py3pep8]
 basepython = python3
@@ -81,6 +82,7 @@ commands =
   flake8 swift test doc setup.py
   flake8 --filename=swift* bin
   python ./setup.py check --restructuredtext --strict
+  ./.manpages {posargs}
 
 [testenv:func]
 basepython = python2.7
@@ -146,6 +148,7 @@ show-source = True
 # system dependencies are missing, since it's used to tell you what system
 # dependencies are missing! This also means that bindep must be installed
 # separately, outside of the requirements files.
+skip_install = True
 deps = bindep
 commands = bindep test