Browse Source

Fix debian package builds. (#10931)

This was due to dh-virtualenv builds being broken due to Shpinx removing
deprecated APIs.
Erik Johnston 2 years ago
parent
commit
a8bbf08576
2 changed files with 4 additions and 2 deletions
  1. 1 0
      changelog.d/10931.bugfix
  2. 3 2
      docker/Dockerfile-dhvirtualenv

+ 1 - 0
changelog.d/10931.bugfix

@@ -0,0 +1 @@
+Fix debian builds due to dh-virtualenv no longer being able to build their docs.

+ 3 - 2
docker/Dockerfile-dhvirtualenv

@@ -47,8 +47,9 @@ RUN apt-get update -qq -o Acquire::Languages=none \
     && cd /dh-virtualenv \
     && env DEBIAN_FRONTEND=noninteractive mk-build-deps -ri -t "apt-get -y --no-install-recommends"
 
-# build it
-RUN cd /dh-virtualenv && dpkg-buildpackage -us -uc -b
+# Build it. Note that building the docs doesn't work due to differences in
+# Sphinx APIs across versions/distros.
+RUN cd /dh-virtualenv && DEB_BUILD_OPTIONS=nodoc dpkg-buildpackage -us -uc -b
 
 ###
 ### Stage 1