From patchwork Wed Jan  8 18:35:28 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D7810: packaging: update Ubuntu docker build dependencies to Python 3
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 44190
Message-Id: <differential-rev-PHID-DREV-7d3w5amf54wprb7pec5v-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Wed, 8 Jan 2020 18:35:28 +0000

sheehan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Changeset 7574ccd87200f02e <https://phab.mercurial-scm.org/rHG7574ccd87200f02e49da64f416c37e43163ba077> updated the Debian docker builds to Python 3. In doing
  so, the Ubuntu docker-based builds broke, as the Dockerfile does not
  include the new dependencies as specified in `contrib/packaging/debian/control`.
  
  This commit changes the dependencies in the Ubuntu Dockerfile template
  to their Python 3 equivalents, fixing `make docker-ubuntu-bionic`.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D7810

AFFECTED FILES
  contrib/packaging/docker/ubuntu.template

CHANGE DETAILS




To: sheehan, #hg-reviewers
Cc: mercurial-devel

diff --git a/contrib/packaging/docker/ubuntu.template b/contrib/packaging/docker/ubuntu.template
--- a/contrib/packaging/docker/ubuntu.template
+++ b/contrib/packaging/docker/ubuntu.template
@@ -10,7 +10,8 @@
   dh-python \
   less \
   python \
-  python-all-dev \
-  python-docutils \
+  python3-all \
+  python3-all-dev \
+  python3-docutils \
   unzip \
   zip