Stop building manpages

Yelp · Jan 10, 2019 · d8b7302 · d8b7302
1 parent c1f2cc6
commit d8b7302
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 71 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,6 @@ cache:
 before_cache:
   # We don't currently use any secure environment variables, but just in case, and also to avoid caches that grow forever, remove log dirs.
   - rm -rf .tox/*/log .tox/log .tox/*/local/log
-  # For some reason (because we build the manpages toxenv inside docker, maybe?), caching .tox/manpages leads to failing itest_% builds.
-  - rm -rf .tox/manpages
 python:
   - "3.6"
 env:

diff --git a/build-manpages.sh b/build-manpages.sh
diff --git a/debian/rules b/debian/rules
@@ -13,9 +13,6 @@ override_dh_auto_clean:
 override_dh_auto_build:
 	true
 
-override_dh_installdocs:
-	tox -e manpages -i $(PIP_INDEX_URL)
-
 # do not call `make test` as part of packaging
 override_dh_auto_test:
 	true

diff --git a/tox.ini b/tox.ini
@@ -28,9 +28,6 @@ commands =
     sphinx-apidoc -f -e -o docs/source/generated/ paasta_tools
     sphinx-build -b html -d docs/build/doctrees docs/source docs/build/html
 
-[testenv:manpages]
-commands = ./build-manpages.sh
-
 [testenv:paasta_itests]
 changedir=paasta_itests/
 passenv = DOCKER_TLS_VERIFY DOCKER_HOST DOCKER_CERT_PATH

diff --git a/yelp_package/dockerfiles/bionic/Dockerfile b/yelp_package/dockerfiles/bionic/Dockerfile
@@ -29,7 +29,6 @@ RUN apt-get update > /dev/null && \
         debhelper \
         gdebi-core \
         git \
-        help2man \
         libffi-dev \
         libgpgme11 \
         libgpgme-dev \

diff --git a/yelp_package/dockerfiles/trusty/Dockerfile b/yelp_package/dockerfiles/trusty/Dockerfile
@@ -28,7 +28,6 @@ RUN apt-get update > /dev/null && \
         debhelper \
         gdebi-core \
         git \
-        help2man \
         libffi-dev \
         libgpgme11 \
         libssl-dev \

diff --git a/yelp_package/dockerfiles/xenial/Dockerfile b/yelp_package/dockerfiles/xenial/Dockerfile
@@ -28,7 +28,6 @@ RUN apt-get update > /dev/null && \
         debhelper \
         gdebi-core \
         git \
-        help2man \
         libffi-dev \
         libgpgme11 \
         libssl-dev \

diff --git a/yelp_package/itest/ubuntu.sh b/yelp_package/itest/ubuntu.sh
@@ -125,8 +125,6 @@ for command in $PAASTA_COMMANDS
 do
   echo "Running 'paasta $command -h' to make sure it works"
   paasta $command -h >/dev/null || (echo "paasta $command failed to execute!"; exit 1)
-  echo "Checking for a man page"
-  man -f paasta-$command
 done
 echo "Running 'paasta --version', it should return non-zero"
 paasta --version || (echo "paasta --version failed to execute!"; exit 1)