Merge ~racb/git-ubuntu:core20 into git-ubuntu:master

[Robie Basak]

Make Jenkins happy

This branch is unlikely to initially pass CI as the CI build and test scripts will need to be fixed first to work against it.

[Robie Basak (racb)]

Corresponding CI changes:

https://github.com/canonical/server-test-scripts/pull/94
https://github.com/canonical/server-jenkins-jobs/pull/177

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:80dd55aadfbb53e194f9d38233977126b05959ab
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/14/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: VM Reset
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/14//rebuild

review: Approve (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:80dd55aadfbb53e194f9d38233977126b05959ab
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/15/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: VM Reset
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/15//rebuild

review: Approve (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:70305eb4eb39e41bd105f28bd2915da7e37b04e1
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/16/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: VM Reset
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/16//rebuild

review: Approve (continuous-integration)

[Bryce Harrington (bryce)]

This looks great! A few minor comments/questions below but not really anything substantial. You know I love patches that have more removal than addition, and being able to build this as a deb will be awesome.

I had meant to play with building this manually but have no doubt it works and am unfortunately running against EOD; I'm sure I'll get a chance some day, so no worries.

The one notable piece is the snap.sh's big warning comment about it being destructive to the host. If you're actually worried someone might run it (it's in the root of the repository after all), you might have it echo that message to stderr prior to the sudo prompt. It doesn't sound to me like it would be irreversibly destructive, just that it modifies apt and installs some things.

Anyway, nice work, looking forward to seeing this go in. :-)

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:bc6b4fa5e0ecad8730121b7467c22f2a4ddaf083
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/17/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: VM Reset
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/17//rebuild

review: Approve (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:de874618561760657fc95a8a6eadfbc9d8ff2e27
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/18/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: VM Reset
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/18//rebuild

review: Approve (continuous-integration)

diff --git a/snap-wrappers/wrappers/git-ubuntu-self-test b/bin/self-test
 similarity index 83%
 rename from snap-wrappers/wrappers/git-ubuntu-self-test
 rename to bin/self-test
index d5f1bda..e7ae13a 100755
--- a/snap-wrappers/wrappers/git-ubuntu-self-test
+++ b/bin/self-test
@@ -1,4 +1,4 @@
-#!/snap/git-ubuntu/current/bin/bash
+#!/bin/bash
 
 function die() {
     echo "Error:  ${*}" 1>&2
@@ -57,10 +57,14 @@ snap_run() {
     $exec snap run --shell "$snap" -c 'exec "$0" "$@"' "$@"
 }
 
-if [ -n "$SNAP" -a -z "$TEST_TREE" ]; then
-    pkg_dir=${SNAP}/lib/python3.6/site-packages
-    snap_bin_dir="${SNAP}/bin"
-    pylintrc_path="${SNAP}/etc/pylintrc"
+if [ -n "$TEST_SYSTEM_TREE" ]; then
+    pkg_dir=$(dirname $(python3 -c 'import gitubuntu; print(gitubuntu.__path__[0])')) 
+    snap_bin_glob=/usr/bin/git-ubuntu.*
+    pylintrc_path=/usr/share/git-ubuntu/pylintrc
+elif [ -n "$SNAP" -a -z "$TEST_TREE" ]; then
+    pkg_dir=${SNAP}/usr/lib/python3/dist-packages
+    snap_bin_glob="${SNAP}/usr/bin/git-ubuntu.*"
+    pylintrc_path="${SNAP}/usr/share/git-ubuntu/pylintrc"
     [ -d "$pkg_dir" ] ||
         { error "$pkg_dir is not a directory"; exit 1; }
 else
@@ -86,7 +90,7 @@ else
         snap_run --exec git-ubuntu "$0" "$@"
     fi
     pkg_dir=$( cd "${TEST_TREE%/}" && pwd )
-    snap_bin_dir="${pkg_dir}/bin"
+    snap_bin_glob="${pkg_dir}/bin/*.py"
     pylintrc_path="$TEST_TREE/.pylintrc"
 fi
 
@@ -103,7 +107,11 @@ cd "${pkg_dir}" \
 ln -s "${pkg_dir}/gitubuntu" "${tmp_dir}" \
     || die "Could not create link to gitubuntu module in ${tmp_dir}"
 
-error "Inside git-ubuntu snap $SNAP_REVISION/$SNAP_VERSION."
+if [ -n "$TEST_SYSTEM_TREE" ]; then
+    error "Testing git-ubuntu system installation."
+else
+    error "Inside git-ubuntu snap $SNAP_REVISION/$SNAP_VERSION."
+fi
 error "Testing tree in $pkg_dir/gitubuntu"
 error "Working dir $PWD"
 
@@ -113,17 +121,22 @@ function cleanup() {
 }
 trap cleanup EXIT
 
-# Check dependencies are installed
-if python3 -m pip check
-then
-    echo "pip3 found all required dependencies"
-else
-    echo "pip check failed; self test will fail"
-    retval=1
+if [ -z "$TEST_SYSTEM_TREE" ]; then
+    # Check dependencies are installed
+    if python3 -m pip check
+    then
+        echo "pip3 found all required dependencies"
+    else
+        echo "pip check failed; self test will fail"
+        retval=1
+    fi
 fi
 
 # Style check python modules
-if python3 -m pylint --rcfile "$pylintrc_path" -E gitubuntu/
+# For some reason, pylint hangs indefinitely if used without a -j option (the
+# default is two) in the multiprocessing module. As a workaround for now, we
+# specify -j1, which seems to work.
+if python3 -m pylint --rcfile "$pylintrc_path" -E gitubuntu/ -j1
 then
     echo "pylint passed!"
 else
@@ -172,7 +185,7 @@ while IFS= read -r -d '' script_source; do
     else
         echo "SKIP (compilation) ${script}"
     fi
-done < <(find "${snap_bin_dir}" -name "*.py" -print0)
+done < <(compgen -G "$snap_bin_glob")
 
 # Run the unit testsuite
 if COVERAGE_FILE="${tmp_dir}/coverage.txt" python3 -m pytest -p no:cacheprovider --cov=gitubuntu gitubuntu/*
diff --git a/debian/bash-completion b/debian/bash-completion
 new file mode 100644
index 0000000..7c42e96
--- /dev/null
+++ b/debian/bash-completion
@@ -0,0 +1 @@
+doc/gitubuntu-completion.sh
diff --git a/debian/changelog b/debian/changelog
 new file mode 100644
index 0000000..24c1a2d
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+git-ubuntu (0) UNRELEASED; urgency=medium
+
+  * Initial packaging.
+
+ -- Robie Basak <[e-mail]>  Thu, 11 Mar 2021 15:23:18 +0000
diff --git a/debian/control b/debian/control
 new file mode 100644
index 0000000..6ad0540
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,38 @@
+Source: git-ubuntu
+Section: devel
+Priority: optional
+Standards-Version: 4.5.1
+Maintainer: Ubuntu Developers <[e-mail]>
+Build-Depends: bash-completion,
+               debhelper-compat (= 12),
+               debian-archive-keyring,
+               dh-exec,
+               dh-python,
+               git,
+               git-buildpackage,
+               pristine-tar,
+               python3 (>= 3.6),
+               python3-cachetools,
+               python3-keyring,
+               python3-keyrings.alt,
+               python3-petname,
+               python3-pygit2,
+               python3-pytest,
+               python3-setuptools,
+               python3-systemd,
+               python3-ubuntutools,
+               python3-zmq,
+               quilt,
+               ubuntu-keyring
+
+Package: git-ubuntu
+Architecture: all
+Depends: debian-archive-keyring,
+         git,
+         git-buildpackage,
+         pristine-tar,
+         quilt,
+         ubuntu-keyring,
+         ${misc:Depends},
+         ${python3:Depends}
+Description: maintain an Ubuntu source package in a git tree
diff --git a/debian/copyright b/debian/copyright
 new file mode 100644
index 0000000..f3e8a64
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,6 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: [e-mail]
+
+Files: *
+Copyright: 2014-2021 Canonical Ltd
+License: GPLv3
diff --git a/debian/extra/git-ubuntu.self-test b/debian/extra/git-ubuntu.self-test
 new file mode 100755
index 0000000..2d60632
--- /dev/null
+++ b/debian/extra/git-ubuntu.self-test
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+TEST_SYSTEM_TREE=1 exec /usr/share/git-ubuntu/self-test "$@"
diff --git a/debian/install b/debian/install
 new file mode 100755
index 0000000..e150a16
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,9 @@
+#!/usr/bin/dh-exec
+.pylintrc => usr/share/git-ubuntu/pylintrc
+bin/git-merge-changelogs => usr/bin/git-ubuntu.merge-changelogs
+bin/git-reconstruct-changelog => usr/bin/git-ubuntu.reconstruct-changelog
+bin/import-source-packages.py => usr/bin/git-ubuntu.import-source-packages
+bin/self-test => usr/share/git-ubuntu/self-test
+bin/source-package-walker.py => usr/bin/git-ubuntu.source-package-walker
+bin/update-repository-alias.py => usr/bin/git-ubuntu.update-repository-alias
+debian/extra/git-ubuntu.self-test => usr/bin/git-ubuntu.self-test
diff --git a/debian/manpages b/debian/manpages
 new file mode 100644
index 0000000..8a47eba
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+man/man1/*.1
diff --git a/debian/py3dist-overrides b/debian/py3dist-overrides
 new file mode 100644
index 0000000..32f925e
--- /dev/null
+++ b/debian/py3dist-overrides
@@ -0,0 +1,2 @@
+zmq python3-zmq
+ubuntutools python3-ubuntutools
diff --git a/debian/rules b/debian/rules
 new file mode 100755
index 0000000..d602341
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --with bash-completion,python3 --buildsystem=pybuild
diff --git a/debian/source/format b/debian/source/format
 new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/debian/tests/control b/debian/tests/control
 new file mode 100644
index 0000000..4e00487
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Test-Command: git-ubuntu.self-test
+Restrictions: allow-stderr
diff --git a/gitubuntu/__main__.py b/gitubuntu/__main__.py
index 4bf96c1..0ad68bf 100644
--- a/gitubuntu/__main__.py
+++ b/gitubuntu/__main__.py
@@ -4,12 +4,7 @@ from collections import namedtuple
 import logging
 import sys
 
-try:
-    pkg = 'python3-pkg-resources'
-    import pkg_resources
-except:
-    logging.error('Is %s installed?', pkg)
-    sys.exit(1)
+import pkg_resources
 
 TopLevelDefaults = namedtuple(
     'TopLevelDefaults',
@@ -67,12 +62,7 @@ def main():
         import textwrap
         from gitubuntu.run import run
 
-        try:
-            pkg = 'python3-argcomplete'
-            import argcomplete
-        except:
-            logging.error('Is %s installed?', pkg)
-            sys.exit(1)
+        import argcomplete
 
         logging.getLogger('keyring').setLevel(logging.WARNING)
 
diff --git a/gitubuntu/build.py b/gitubuntu/build.py
index ab2467f..4606a6c 100644
--- a/gitubuntu/build.py
+++ b/gitubuntu/build.py
@@ -46,18 +46,10 @@ from gitubuntu.source_information import (
     derive_codename_from_series,
 )
 from gitubuntu.test_util import get_test_changelog
-try:
-    pkg = 'python3-debian'
-    from debian.debfile import PART_EXTS
-    pkg = 'python3-petname'
-    import petname
-    pkg = 'python3-pygit2'
-    import pygit2
-    pkg = 'python3-pytest'
-    import pytest
-except ImportError:
-    logging.error('Is %s installed?', pkg)
-    sys.exit(1)
+from debian.debfile import PART_EXTS
+import petname
+import pygit2
+import pytest
 
 from distro_info import DebianDistroInfo, UbuntuDistroInfo
 
diff --git a/gitubuntu/clone.py b/gitubuntu/clone.py
index 0eca56e..2e0d48d 100644
--- a/gitubuntu/clone.py
+++ b/gitubuntu/clone.py
@@ -12,14 +12,8 @@ from gitubuntu.git_repository import (
 )
 from gitubuntu.run import decode_binary, run
 
-try:
-    pkg = 'python3-pkg-resources'
-    import pkg_resources
-    pkg = 'python3-pygit2'
-    import pygit2
-except ImportError:
-    logging.error('Is %s installed?', pkg)
-    sys.exit(1)
+import pkg_resources
+import pygit2
 
 def copy_hooks(src, dst):
     try:
diff --git a/gitubuntu/dsc.py b/gitubuntu/dsc.py
index 1fc3129..786b744 100644
--- a/gitubuntu/dsc.py
+++ b/gitubuntu/dsc.py
@@ -2,12 +2,7 @@ import logging
 import os
 import re
 import sys
-try:
-    pkg = 'python3-ubuntutools'
-    from ubuntutools.archive import Dsc
-except ImportError:
-    logging.error('Is %s installed?', pkg)
-    sys.exit(1)
+from ubuntutools.archive import Dsc
 
 orig_re = re.compile(r'.*\.orig\.tar\.[^.]+$')
 component_re = re.compile(r'^(?P<pkgname>.*)_(?P<version>.*)\.orig-(?P<component>[^.]+)\.tar\.[^.]+$')
diff --git a/gitubuntu/exportorig.py b/gitubuntu/exportorig.py
index a04362c..be4ded2 100644
--- a/gitubuntu/exportorig.py
+++ b/gitubuntu/exportorig.py
@@ -6,12 +6,7 @@ import gitubuntu.build
 from gitubuntu.cache import CACHE_PATH
 import gitubuntu.git_repository
 
-try:
-    pkg = 'python3-pygit2'
-    import pygit2
-except ImportError:
-    logging.error('Is %s installed?', pkg)
-    sys.exit(1)
+import pygit2
 
 def parse_args(subparsers=None, base_subparsers=None):
     kwargs = dict(
diff --git a/gitubuntu/git_repository.py b/gitubuntu/git_repository.py
index 2cfdf9a..8dc4d1f 100644
--- a/gitubuntu/git_repository.py
+++ b/gitubuntu/git_repository.py
@@ -31,17 +31,10 @@ from gitubuntu.run import (
 import gitubuntu.spec
 from gitubuntu.test_util import get_test_changelog
 import gitubuntu.versioning
-try:
-    pkg = 'python3-debian'
-    import debian.changelog
-    import debian.debian_support
-    pkg = 'python3-pygit2'
-    import pygit2
-    pkg = 'python3-pytest'
-    import pytest
-except ImportError:
-    logging.error('Is %s installed?', pkg)
-    sys.exit(1)
+import debian.changelog
+import debian.debian_support
+import pygit2
+import pytest
 
 
 def _follow_symlinks_to_blob(repo, top_tree_object, search_path,
@@ -72,7 +65,7 @@ def _follow_symlinks_to_blob(repo, top_tree_object, search_path,
         tail = None
 
     entry = _rel_tree[head]
-    if entry.type == 'tree':
+    if entry.type in [pygit2.GIT_OBJ_TREE, 'tree']:
         return _follow_symlinks_to_blob(
             repo=repo,
             top_tree_object=top_tree_object,
@@ -80,7 +73,7 @@ def _follow_symlinks_to_blob(repo, top_tree_object, search_path,
             _rel_tree=repo.get(entry.id),
             _rel_path=posixpath.join(_rel_path, head),
         )
-    elif entry.type == 'blob' and entry.filemode == pygit2.GIT_FILEMODE_LINK:
+    elif entry.type in [pygit2.GIT_OBJ_BLOB, 'blob'] and entry.filemode == pygit2.GIT_FILEMODE_LINK:
         # Found a symlink. Start again from the top with adjustment for symlink
         # following
         target_tail = [decode_binary(repo.get(entry.id).data)]
@@ -94,7 +87,7 @@ def _follow_symlinks_to_blob(repo, top_tree_object, search_path,
             top_tree_object=top_tree_object,
             search_path=search_path,
         )
-    elif entry.type == 'blob' and entry.filemode in NORMAL_BLOB_MODES:
+    elif entry.type in [pygit2.GIT_OBJ_BLOB, 'blob'] and entry.filemode in NORMAL_BLOB_MODES:
         return repo.get(entry.id)
     else:
         # Found some special entry such as a "gitlink" (submodule entry)
@@ -591,7 +584,7 @@ class Changelog:
     @property
     def _shell_version(self):
         parse_params = '-n1 -SVersion'
-        shell_cmd = 'grep -m1 \'^\S\' | sed \'s/.*(\(.*\)).*/\\1/\''
+        shell_cmd = "grep -m1 '^\\S' | sed 's/.*(\\(.*\\)).*/\\1/'"
         try:
             raw_out = self._dpkg_parsechangelog(parse_params)
         except CalledProcessError:
@@ -627,7 +620,7 @@ class Changelog:
     @property
     def _shell_previous_version(self):
         parse_params = '-n1 -o1 -SVersion'
-        shell_cmd = 'grep -m1 \'^\S\' | tail -1 | sed \'s/.*(\(.*\)).*/\\1/\''
+        shell_cmd = "grep -m1 '^\\S' | tail -1 | sed 's/.*(\\(.*\\)).*/\\1/'"
         try:
             raw_out = self._dpkg_parsechangelog(parse_params)
         except CalledProcessError:
@@ -652,7 +645,7 @@ class Changelog:
     @property
     def _shell_maintainer(self):
         parse_params = '-SMaintainer'
-        shell_cmd = 'grep -m1 \'^ --\' | sed \'s/ -- \(.*\)  \(.*\)/\\1/\''
+        shell_cmd = "grep -m1 '^ --' | sed 's/ -- \\(.*\\)  \\(.*\\)/\\1/'"
         try:
             return self._dpkg_parsechangelog(parse_params)
         except CalledProcessError:
@@ -676,7 +669,7 @@ class Changelog:
     @property
     def _shell_date(self):
         parse_params = '-SDate'
-        shell_cmd = 'grep -m1 \'^ --\' | sed \'s/ -- \(.*\)  \(.*\)/\\2/\''
+        shell_cmd = "grep -m1 '^ --' | sed 's/ -- \\(.*\\)  \\(.*\\)/\\2/'"
         try:
             return self._dpkg_parsechangelog(parse_params)
         except CalledProcessError:
@@ -697,7 +690,7 @@ class Changelog:
     @property
     def _shell_all_versions(self):
         parse_params = '--format rfc822 -SVersion --all'
-        shell_cmd = 'grep \'^\S\' | sed \'s/.*(\(.*\)).*/\\1/\''
+        shell_cmd = "grep '^\\S' | sed 's/.*(\\(.*\\)).*/\\1/'"
         try:
             version_lines = self._dpkg_parsechangelog(parse_params)
         except CalledProcessError:
@@ -734,7 +727,7 @@ class Changelog:
     @property
     def _shell_distribution(self):
         parse_params = '-SDistribution'
-        shell_cmd = 'grep -m1 \'^\S\' | sed \'s/.*\ .*\ \(.*\);.*/\\1/\''
+        shell_cmd = "grep -m1 '^\\S' | sed 's/.*\\ .*\\ \\(.*\\);.*/\\1/'"
         try:
             return self._dpkg_parsechangelog(parse_params)
         except CalledProcessError:
@@ -755,7 +748,7 @@ class Changelog:
     @property
     def _shell_srcpkg(self):
         parse_params = '-SSource'
-        shell_cmd = 'grep -m1 \'^\S\' | sed \'s/\(.*\)\ .*\ .*;.*/\\1/\''
+        shell_cmd = "grep -m1 '^\\S' | sed 's/\\(.*\\)\\ .*\\ .*;.*/\\1/'"
         try:
             return self._dpkg_parsechangelog(parse_params)
         except CalledProcessError:
@@ -1095,7 +1088,8 @@ class GitUbuntuRepository:
         # (for example in deriving the environment to use for calls to the git
         # CLI). This permits the behaviour to remain identical for now.
         # Eventually we can break previous behaviour and eliminate the need for
-        # this.
+        # this. See also: gitubuntu.test_fixtures.repo; the handling of EMAIL
+        # there could be made cleaner when this is cleaned up.
         self._initial_env = os.environ.copy()
 
         self.set_git_attributes()
diff --git a/gitubuntu/importer.py b/gitubuntu/importer.py
index b2a9916..26908cb 100644
--- a/gitubuntu/importer.py
+++ b/gitubuntu/importer.py
@@ -71,14 +71,8 @@ from gitubuntu.source_information import (
 import gitubuntu.spec as spec
 from gitubuntu.version import VERSION
 from gitubuntu.versioning import version_compare
-try:
-    pkg = 'python3-pygit2'
-    import pygit2
-    pkg = 'python3-lazr.restfulclient'
-    from lazr.restfulclient.errors import NotFound, PreconditionFailed
-except ImportError:
-    logging.error('Is %s installed?', pkg)
-    sys.exit(1)
+import pygit2
+from lazr.restfulclient.errors import NotFound, PreconditionFailed
 
 
 class GitUbuntuImportError(Exception):
@@ -844,7 +838,7 @@ def import_patches_applied_tree(repo, dsc_pathname):
 
     try:
         if not is_dir_3_0_quilt(extracted_dir):
-            raise StopIteration()
+            return
 
         while True:
             try:
@@ -906,7 +900,7 @@ def import_patches_applied_tree(repo, dsc_pathname):
                 # quilt returns 2 when done pushing
                 if e.returncode != 2:
                     raise
-                raise StopIteration()
+                return
     finally:
         os.chdir(oldcwd)
         shutil.rmtree(extract_dir)
@@ -1193,7 +1187,7 @@ def update_devel_branches(
             series_name_list=ubuntu_sinfo.all_series_name_list,
         ):
             if commit is None:
-                logging.warn(
+                logging.warning(
                     "Source package '%s' does not appear to have been published "
                     "in Ubuntu. No %s created.",
                     pkgname,
@@ -1509,7 +1503,7 @@ def validate_upload_tag(
     :returns: True if the upload tag validates; False otherwise.
     """
     if upload_tag.peel().tree.id != import_tree.id:
-        logging.warn(
+        logging.warning(
             "Found upload tag %s, but the corresponding tree "
             "does not match the published version. Will import %s as "
             "normal, ignoring the upload tag.",
@@ -1526,7 +1520,7 @@ def validate_upload_tag(
         for commit in changelog_parents
     )
     if not has_changelog_parent_ancestor:
-        logging.warn(
+        logging.warning(
             "Found upload tag %s, but no changelog parent is its ancestor. "
             "Will import %s as normal, ignoring the upload tag.",
             repo.tag_to_pretty_name(upload_tag),
@@ -1999,9 +1993,7 @@ def import_applied_dsc(
         if repo.treeishs_identical(
                 unapplied_import_tree_hash, str(applied_tip_head.peel().id)
             ):
-            logging.warn('%s is identical to %s',
-                         pretty_head_name, version
-                        )
+            logging.warning('%s is identical to %s', pretty_head_name, version)
             return
         applied_tip_version, _ = repo.get_changelog_versions_from_treeish(
                              str(applied_tip_head.peel().id),
@@ -2025,9 +2017,12 @@ def import_applied_dsc(
          )
     else:
         if version_compare(version, applied_tip_version) <= 0:
-            logging.warn('Version to import (%s) is not after %s tip (%s)',
-                         version, pretty_head_name, applied_tip_version
-                        )
+            logging.warning(
+                'Version to import (%s) is not after %s tip (%s)',
+                 version,
+                 pretty_head_name,
+                 applied_tip_version,
+            )
 
 
         applied_changelog_parent_commits = get_changelog_parent_commits(
diff --git a/gitubuntu/importer_test.py b/gitubuntu/importer_test.py
index b09b71c..1848d76 100644
--- a/gitubuntu/importer_test.py
+++ b/gitubuntu/importer_test.py
@@ -1141,7 +1141,12 @@ def MockSPI(dsc_path, version):
     spi.dsc_pathname = dsc_path
     spi.distribution_name = 'Ubuntu'
     spi.version = version
-    spi.date_created = datetime.datetime(1970, 1, 1)
+    spi.date_created = datetime.datetime(
+        1970,
+        1,
+        1,
+        tzinfo=datetime.timezone.utc,
+    )
     head_name = Mock(name='head_name')
     head_name.return_value = 'importer/ubuntu/trusty'
     spi.head_name = head_name
@@ -1795,7 +1800,15 @@ def test_authorship_date(repo, override, input_string, expected_result):
             head_name='ubuntu/focal',
             skip_orig=True,
             parent_overrides={},
-            commit_date=datetime.datetime(1972, 3, 3, 12, 45, 57),
+            commit_date=datetime.datetime(
+                1972,
+                3,
+                3,
+                12,
+                45,
+                57,
+                tzinfo=datetime.timezone.utc,
+            ),
             changelog_date_overrides=(
                 frozenset({'1-1'}) if override else frozenset()
             ),
@@ -1805,6 +1818,9 @@ def test_authorship_date(repo, override, input_string, expected_result):
     )
     commit = import_ref.peel(pygit2.Commit)
     assert commit.author.time == int(
-        datetime.datetime(*expected_result[:6]).timestamp()
+        datetime.datetime(
+            *expected_result[:6],
+            tzinfo=datetime.timezone.utc,
+        ).timestamp()
     )
     assert commit.author.offset == expected_result[6]
diff --git a/gitubuntu/rich_history.py b/gitubuntu/rich_history.py
index b987b46..1ca61e0 100644
--- a/gitubuntu/rich_history.py
+++ b/gitubuntu/rich_history.py
@@ -140,9 +140,9 @@ def export_all(repo, path, namespace='importer'):
         try:
             export_upload_tag(repo, path, ref, commit_map)
         except MultipleParentError:
-            logging.warn("Multiple parents exporting %s" % ref.name)
+            logging.warning("Multiple parents exporting %s" % ref.name)
         except BaseNotFoundError:
-            logging.warn("No base found exporting %s" % ref.name)
+            logging.warning("No base found exporting %s" % ref.name)
 
 
 def import_single(repo, path, version, namespace='importer'):
diff --git a/gitubuntu/source_builder_test.py b/gitubuntu/source_builder_test.py
index 9131a98..ab36985 100644
--- a/gitubuntu/source_builder_test.py
+++ b/gitubuntu/source_builder_test.py
@@ -2,6 +2,7 @@ import os
 import subprocess
 import tempfile
 
+import pygit2
 import pytest
 
 import gitubuntu.source_builder as target
@@ -140,7 +141,7 @@ def test_source_quilt_no_patches(repo):
     with target.Source(target.SourceSpec()) as dsc_path:
         top = dsc_path_to_tree(repo, dsc_path)
         debian_entry = top['debian']
-        assert debian_entry.type == 'tree'
+        assert debian_entry.type in [pygit2.GIT_OBJ_TREE, 'tree']
         debian = repo.raw_repo.get(debian_entry.id)
         with pytest.raises(KeyError):
             debian['patches']
diff --git a/gitubuntu/source_information.py b/gitubuntu/source_information.py
index cf729b8..3cc11e7 100644
--- a/gitubuntu/source_information.py
+++ b/gitubuntu/source_information.py
@@ -10,20 +10,12 @@ _LP_LOGIN_AUTH = None
 _lp_service = 'production'
 _lp_api_version = 'devel'
 
-try:
-    pkg = 'python3-cachetools'
-    import cachetools
-    pkg = 'python3-distro-info'
-    from distro_info import DebianDistroInfo, UbuntuDistroInfo
-    pkg = 'python3-launchpadlib'
-    from launchpadlib.launchpad import Launchpad as LP
-    pkg = 'python3-ubuntutools'
-    from ubuntutools.archive import UbuntuSourcePackage, DebianSourcePackage, DownloadError
-    import ubuntutools.lp.lpapicache
-    from ubuntutools.lp.lpapicache import SourcePackagePublishingHistory
-except ImportError:
-    logging.error('Is %s installed?', pkg)
-    sys.exit(1)
+import cachetools
+from distro_info import DebianDistroInfo, UbuntuDistroInfo
+from launchpadlib.launchpad import Launchpad as LP
+from ubuntutools.archive import UbuntuSourcePackage, DebianSourcePackage, DownloadError
+import ubuntutools.lp.lpapicache
+from ubuntutools.lp.lpapicache import SourcePackagePublishingHistory
 
 _ddi = DebianDistroInfo()
 _udi = UbuntuDistroInfo()
@@ -637,7 +629,7 @@ class GitUbuntuSourceInformation(object):
                 )
                )
             yield spi
-        raise StopIteration()
+        return
 
     @staticmethod
     def interleave_launchpad_versions_published_after(
diff --git a/gitubuntu/submit.py b/gitubuntu/submit.py
index 19e7678..aba426f 100644
--- a/gitubuntu/submit.py
+++ b/gitubuntu/submit.py
@@ -16,12 +16,7 @@ from gitubuntu.git_repository import (
 from gitubuntu.run import decode_binary, run
 from gitubuntu.source_information import GitUbuntuSourceInformation, launchpad_login_auth
 
-try:
-    pkg = 'python3-lazr.restfulclient'
-    from lazr.restfulclient.errors import BadRequest
-except ImportError:
-    logging.error('Is %s installed?', pkg)
-    sys.exit(1)
+from lazr.restfulclient.errors import BadRequest
 
 
 def parse_args(subparsers=None, base_subparsers=None):
diff --git a/gitubuntu/test_fixtures.py b/gitubuntu/test_fixtures.py
index 60a5457..cef8b82 100644
--- a/gitubuntu/test_fixtures.py
+++ b/gitubuntu/test_fixtures.py
@@ -23,6 +23,15 @@ def repo():
     except OSError:
         oldcwd = None
 
+    # The git CLI requires a valid email address to be available. Normally, we
+    # might expect this to be the git-ubuntu CLI caller's responsibility to
+    # set. However, in tests, since GitUbuntuRepository calls the git CLI for
+    # some operations that cannot currently be done through pygit2, it makes
+    # sense to set EMAIL temporarily so that the test suite is independent of
+    # the environment in which it is running.
+    old_email = os.environ.get('EMAIL')
+    os.environ['EMAIL'] = '[e-mail]'
+
     with tempfile.TemporaryDirectory() as path:
         os.chdir(path)
         try:
@@ -33,6 +42,18 @@ def repo():
             if oldcwd:
                 os.chdir(oldcwd)
 
+            # Reset the EMAIL environment variable to what it was. This makes
+            # little practical difference, but may prevent confusion and a
+            # headache if in the future a different test is written that does
+            # not use this fixture but does rely somehow on the EMAIL
+            # environment variable not changing, as such a test would become
+            # non-deterministic depending on whether other tests have run that
+            # use this fixture.
+            if old_email is None:
+                del os.environ['EMAIL']
+            else:
+                os.environ['EMAIL'] = old_email
+
 
 @pytest.fixture
 def pygit2_repo():
diff --git a/gitubuntu/versioning.py b/gitubuntu/versioning.py
index bf58426..2d12cd5 100644
--- a/gitubuntu/versioning.py
+++ b/gitubuntu/versioning.py
@@ -9,17 +9,11 @@ from gitubuntu.source_information import (
     NoPublicationHistoryException,
 )
 
-try:
-    pkg = 'python3-debian'
-    import debian
-    # This effectively declares an interface for the type of Version
-    # object we want to use in the git-ubuntu code
-    from debian.debian_support import NativeVersion as Version
-    pkg = 'python3-pytest'
-    import pytest
-except ImportError:
-    logging.error('Is %s installed?', pkg)
-    sys.exit(1)
+import debian
+# This effectively declares an interface for the type of Version
+# object we want to use in the git-ubuntu code
+from debian.debian_support import NativeVersion as Version
+import pytest
 
 __all__ = [
    "next_development_version_string",
diff --git a/setup.py b/setup.py
index 8262eed..8d8d68b 100644
--- a/setup.py
+++ b/setup.py
@@ -39,6 +39,7 @@ setup(name='gitubuntu',
         'pytest==3.1.3',
         'pytest-cov==2.5.1',
         'systemd-python',
+        'ubuntutools',
         'zmq',
     ]
 )
diff --git a/snap-wrappers/wrappers/awk b/snap-wrappers/wrappers/awk
 deleted file mode 100755
index 2d4abb7..0000000
--- a/snap-wrappers/wrappers/awk
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/snap/git-ubuntu/current/bin/bash
-
-CORE_SNAP="/snap/core/current"
-CORE_SNAP_PATH="$CORE_SNAP/usr/local/sbin:$CORE_SNAP/usr/local/bin:$CORE_SNAP/usr/sbin:$CORE_SNAP/usr/bin:$CORE_SNAP/sbin:$CORE_SNAP/bin"
-export PATH="$CORE_SNAP_PATH"
-export LD_LIBRARY_PATH="$CORE_SNAP/lib/x86_64-linux-gnu:$CORE_SNAP/usr/lib/x86_64-linux-gnu"
-exec "$CORE_SNAP/lib64/ld-linux-x86-64.so.2" "$CORE_SNAP/usr/bin/awk" "$@"
diff --git a/snap-wrappers/wrappers/gbp b/snap-wrappers/wrappers/gbp
index 77145d7..fef0928 100755
--- a/snap-wrappers/wrappers/gbp
+++ b/snap-wrappers/wrappers/gbp
@@ -1,9 +1,3 @@
 #!/snap/git-ubuntu/current/bin/bash
 
-CORE_SNAP="/snap/core/current"
-CORE_SNAP_PATH="$CORE_SNAP/usr/local/sbin:$CORE_SNAP/usr/local/bin:$CORE_SNAP/usr/sbin:$CORE_SNAP/usr/bin:$CORE_SNAP/sbin:$CORE_SNAP/bin"
-export PATH="$SNAP/bin/snap:$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
-export PYTHONPATH="$SNAP/lib/python3.6/site-packages"
-export PERL5LIB="$SNAP/usr/share/perl5:$SNAP/usr/share/perl/5.22"
-export DPKG_DATADIR="$SNAP/usr/share/dpkg"
-exec "$SNAP/usr/bin/python3" "$SNAP/bin/gbp" "$@"
+exec "$SNAP/usr/bin/python3" "$SNAP/usr/bin/gbp" "$@"
diff --git a/snap-wrappers/wrappers/git-merge-changelogs b/snap-wrappers/wrappers/git-merge-changelogs
 deleted file mode 100755
index e78ce69..0000000
--- a/snap-wrappers/wrappers/git-merge-changelogs
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/snap/git-ubuntu/current/bin/bash
-
-set -e
-
-branch_base="$1"
-branch_a="$2"
-branch_b="$3"
-
-if [ ! -d debian ]; then
-    echo "$1: must be run from the top level of an unpacked Debian source package." >&2
-    exit 2
-fi
-
-file_base=`mktemp git-mergechangelogs.XXXXXXXXXX`
-file_a=`mktemp git-mergechangelogs.XXXXXXXXXX`
-file_b=`mktemp git-mergechangelogs.XXXXXXXXXX`
-cleanup() { rm -f "$file_base" "$file_a" "$file_b"; }
-trap cleanup EXIT
-
-filename=changelog
-git show "${branch_base}:debian/$filename" > "$file_base"
-git show "${branch_a}:debian/$filename" > "$file_a"
-git show "${branch_b}:debian/$filename" > "$file_b"
-dpkg-mergechangelogs "$file_base" "$file_a" "$file_b" > debian/$filename
diff --git a/snap-wrappers/wrappers/git-reconstruct-changelog b/snap-wrappers/wrappers/git-reconstruct-changelog
 deleted file mode 100755
index 8fbb9f9..0000000
--- a/snap-wrappers/wrappers/git-reconstruct-changelog
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/snap/git-ubuntu/current/bin/bash
-
-set -e
-
-tempfile=`mktemp --tmpdir git-reconstruct-changelog.XXXXXXXXXX`
-cleanup() { rm -f "$tempfile"; }
-trap cleanup EXIT
-
-dch PLACEHOLDER
-sed -n '1,/PLACEHOLDER/{/PLACEHOLDER/!p}' debian/changelog > "$tempfile"
-for rev in `git rev-list --reverse $1..HEAD`; do
-	if [ "`git diff --name-only $rev^ $rev`" = debian/changelog ]; then
-		continue
-	fi
-	git log --pretty=%B -n1 $rev|sed '/^$/d' >> "$tempfile"
-done
-sed -n '1,/PLACEHOLDER/!p' debian/changelog >> "$tempfile"
-mv "$tempfile" debian/changelog
diff --git a/snap-wrappers/wrappers/git-ubuntu-man b/snap-wrappers/wrappers/git-ubuntu
 similarity index 50%
 rename from snap-wrappers/wrappers/git-ubuntu-man
 rename to snap-wrappers/wrappers/git-ubuntu
index 623cdd2..138ffb7 100755
--- a/snap-wrappers/wrappers/git-ubuntu-man
+++ b/snap-wrappers/wrappers/git-ubuntu
@@ -1,3 +1,3 @@
 #!/snap/git-ubuntu/current/bin/bash
 
-man -M $SNAP/usr/share/man $@ 2>/dev/null || man $@
+exec "$SNAP/usr/bin/python3" "$SNAP/usr/bin/git-ubuntu" "$@"
diff --git a/snap-wrappers/wrappers/merge-changelogs b/snap-wrappers/wrappers/merge-changelogs
 new file mode 100755
index 0000000..97f0a2a
--- /dev/null
+++ b/snap-wrappers/wrappers/merge-changelogs
@@ -0,0 +1,3 @@
+#!/snap/git-ubuntu/current/bin/bash
+
+exec "$SNAP/bin/bash" "$SNAP/usr/bin/git-ubuntu.merge-changelogs"
diff --git a/snap-wrappers/wrappers/quilt b/snap-wrappers/wrappers/quilt
index ed09371..49dea83 100755
--- a/snap-wrappers/wrappers/quilt
+++ b/snap-wrappers/wrappers/quilt
@@ -1,8 +1,3 @@
 #!/snap/git-ubuntu/current/bin/bash
 
-CORE_SNAP="/snap/core/current"
-CORE_SNAP_PATH="$CORE_SNAP/usr/local/sbin:$CORE_SNAP/usr/local/bin:$CORE_SNAP/usr/sbin:$CORE_SNAP/usr/bin:$CORE_SNAP/sbin:$CORE_SNAP/bin"
-export PATH="$SNAP/bin/snap:$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
-export LD_LIBRARY_PATH="$SNAP/lib/x86_64-linux-gnu:$SNAP/usr/lib/x86_64-linux-gnu"
-export QUILT_DIR="$SNAP/usr/share/quilt"
-exec "$SNAP/usr/bin/quilt" "$@"
+exec "$SNAP/bin/bash" "$SNAP/usr/bin/quilt" "$@"
diff --git a/snap-wrappers/wrappers/reconstruct-changelog b/snap-wrappers/wrappers/reconstruct-changelog
 new file mode 100755
index 0000000..4f72c77
--- /dev/null
+++ b/snap-wrappers/wrappers/reconstruct-changelog
@@ -0,0 +1,3 @@
+#!/snap/git-ubuntu/current/bin/bash
+
+exec "$SNAP/bin/bash" "$SNAP/usr/bin/git-ubuntu.reconstruct-changelog"
diff --git a/snap-wrappers/wrappers/self-test b/snap-wrappers/wrappers/self-test
 new file mode 100755
index 0000000..4e950e2
--- /dev/null
+++ b/snap-wrappers/wrappers/self-test
@@ -0,0 +1,3 @@
+#!/snap/git-ubuntu/current/bin/bash
+
+exec "$SNAP/bin/bash" "$SNAP/usr/share/git-ubuntu/self-test"
diff --git a/snap.sh b/snap.sh
 new file mode 100644
index 0000000..8d2bb89
--- /dev/null
+++ b/snap.sh
@@ -0,0 +1,101 @@
+#!/bin/sh
+set -e
+
+# This script is a workaround for LP: #1918968. A deb is built, added to an apt
+# repository, snapcraft.yaml adjusted to add a new "package-repositories"
+# section pointing to it, and then snapcraft is run to generate the snap based
+# on it.
+
+# NOTE: THIS SCRIPT IS "DESTRUCTIVE" TO THE HOST
+#
+# It will install deb and snap dependencies using "sudo" on your system as well
+# as install a temporariy git-ubuntu deb locally as built from this source tree
+# and add sources and keys to apt for this purpose. It is intended for use in a
+# temporary VM environment only.
+
+tmp_dir=$(mktemp -d)
+cleanup() { rm -rf "$tmp_dir"; }
+trap cleanup EXIT
+
+# Install dependencies of this script
+#     apt-utils: needed for apt-ftparchive
+#     devscripts: needed for mk-build-deps and dch
+#     equivs: needed by mk-build-deps
+#     python3 and python3-yaml: needed to modify snapcraft.yaml
+sudo apt-get update
+sudo apt-get install -y --no-install-recommends \
+    apt-utils \
+    devscripts \
+    equivs \
+    python3 \
+    python3-yaml
+sudo snap install --classic snapcraft
+
+# Set up debian/changelog with an appropriate version string
+snap_version=$(git describe)
+# Replace the hyphens appropriately to construct a valid Debian native version
+# string
+deb_version=$(echo $snap_version|sed 's/-/+/;s/-/./g')
+
+export DEBEMAIL=[e-mail]
+export DEBFULLNAME="git-ubuntu snap.sh build script"
+dch -v "$deb_version" ''
+dch -r -D focal ''
+
+# Install deb build dependencies and build the deb
+mk-build-deps
+# --allow-downgrades is helpful for development of this script because it
+# ensures that the build dependency package gets updated regardless of the
+# previous version used. In production it is a no-op.
+sudo apt-get install -y --allow-downgrades ./git-ubuntu-build-deps_${deb_version}_all.deb
+debian/rules build
+fakeroot debian/rules binary
+
+# Workaround for LP: #1918969: temporary apt repository signing
+export GNUPGHOME="$tmp_dir/gpg"
+mkdir -m700 "$GNUPGHOME"
+gpg --batch --gen-key <<EOF
+%no-protection
+Key-Type:1
+Key-Length:2048
+Subkey-Type:1
+Subkey-Length:2048
+Name-Real: git-ubuntu build script apt repo
+Name-Email: [e-mail]
+Expire-Date:0
+EOF
+key_id=$(gpg --list-keys --batch --with-colons|awk -F: '$1=="fpr"{print $10;exit}')
+mkdir -p snap/keys
+# 'expr substr "$key_id" 1 8' is a workaround for LP: #1918967
+gpg --batch -a -o snap/keys/$(expr substr "$key_id" 1 8).asc --export
+
+build_dir=$(pwd)
+repo_dir="$tmp_dir/repo"
+mkdir "$repo_dir"
+cd "$repo_dir"
+mv "$build_dir/../git-ubuntu_${deb_version}_all.deb" .
+apt-ftparchive packages . | tee Packages | gzip > Packages.gz
+apt-ftparchive release . > Release
+gpg --yes -o Release.gpg -ab Release
+cd "$build_dir"
+
+# Update snapcraft.yaml with a pointer to our temporary apt repository
+python3 <<EOT
+import yaml
+with open('snap/snapcraft.yaml') as f:
+    snapcraft = yaml.safe_load(f)
+# The version is tweaked here to avoid the snap version being marked "dirty"
+# just because we are modifying snapcraft.yaml with this script.
+snapcraft['version'] = '$snap_version'
+snapcraft['package-repositories'] = [{
+    'type': 'apt',
+    'url': 'file://' + '$repo_dir',
+    'path': '.',
+    'key-id': '$key_id',
+}]
+with open('snap/snapcraft.yaml', 'w') as f:
+    yaml.dump(snapcraft, f)
+EOT
+
+# Build the snap itself
+snapcraft --destructive-mode --enable-experimental-package-repositories
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 3edcd63..bb00454 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -3,456 +3,86 @@ version: git
 summary: Ubuntu development git tooling
 description: Maintain an Ubuntu source package in a git tree
 confinement: classic
-grade: stable
+grade: devel
+base: core20
 
 environment:
-   CORE_SNAP: "/snap/core/current"
-   CORE_SNAP_PATH: "$CORE_SNAP/usr/local/sbin:$CORE_SNAP/usr/local/bin:$CORE_SNAP/usr/sbin:$CORE_SNAP/usr/bin:$CORE_SNAP/sbin:$CORE_SNAP/bin"
-   PERL5LIB: "$SNAP/usr/share/perl5:$SNAP/usr/share/perl/5.22"
-   DPKG_DATADIR: "$SNAP/usr/share/dpkg"
-   GIT_EXEC_PATH: "$SNAP/libexec/git-core"
-   GIT_TEMPLATE_DIR: "$SNAP/share/git-core/templates"
+    DPKG_DATADIR: "$SNAP/usr/share/dpkg"
+    QUILT_DIR: "$SNAP/usr/share/quilt"
+    GIT_EXEC_PATH: "$SNAP/usr/lib/git-core"
+    GIT_TEMPLATE_DIR: "$SNAP/usr/share/git-core/templates"
+    PATH: "$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin"
+    PERL5LIB: "$SNAP/usr/share/perl5:$SNAP/usr/share/perl/5.30"
+    PYTHONPATH: "$SNAP/usr/lib/python3/dist-packages"
 
 apps:
-   git-ubuntu:
-      command: bin/git-ubuntu
-      environment:
-         ORIG_PATH: "$PATH"
-         PYTHONPATH: "$SNAP/lib/python3.6/site-packages"
-         PATH: "$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
-   man:
-      command: wrappers/git-ubuntu-man
-      environment:
-         LD_LIBRARY_PATH: "$SNAP/usr/lib/man-db:$SNAP/lib/x86_64-linux-gnu:$SNAP/usr/lib/x86_64-linux-gnu"
-         PATH: "$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
-   reconstruct-changelog:
-      command: wrappers/git-reconstruct-changelog
-      environment:
-         PATH: "$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
-   merge-changelogs:
-      command: wrappers/git-merge-changelogs
-      environment:
-         PATH: "$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
-   self-test:
-      command: wrappers/git-ubuntu-self-test
-      environment:
-         PYTHONPATH: "$SNAP/lib/python3.6/site-packages"
-         PATH: "$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
-   import-source-packages:
-      command: bin/import-source-packages.py
-      environment:
-         ORIG_PATH: "$PATH"
-         PYTHONPATH: "$SNAP/lib/python3.6/site-packages"
-         PATH: "$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
-   source-package-walker:
-      command: bin/source-package-walker.py
-      environment:
-         PYTHONPATH: "$SNAP/lib/python3.6/site-packages"
-         PATH: "$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
-   update-repository-alias:
-      command: bin/update-repository-alias.py
-      environment:
-         PYTHONPATH: "$SNAP/lib/python3.6/site-packages"
-         PATH: "$SNAP/usr/local/sbin:$SNAP/usr/local/bin:$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CORE_SNAP_PATH"
+    git-ubuntu:
+        command: wrappers/git-ubuntu
+    self-test:
+        command: wrappers/self-test
+    reconstruct-changelog:
+        command: wrappers/reconstruct-changelog
+    merge-changeloges:
+        command: wrappers/merge-changelogs
 
-parts:
-   gbp:
-      plugin: python
-      python-version: python3
-      # from https://github.com/agx/git-buildpackage/archive/debian/0.9.6.tar.gz
-      source: https://people.canonical.com/~rbasak/git-ubuntu/github-gbp-debian-0.9.6.tar.gz
-      source-type: tar
-      source-checksum: sha384/5c9be5a0cdcd0c2a89de2470617361d5f891befa854f32a40e96b2443668fef2068456bf6bcb5ac11c92a0487531a782
-      requirements: requirements.txt
-      stage:
-         - -usr/bin/py*
-         - -usr/bin/2to3*
-         - -usr/share/*python*
-         - -usr/lib/python3.5
-         - -usr/lib/python3.6
-      after: [git, pristine-tar, python3]
-   git:
-      plugin: autotools
-      # from https://github.com/git/git/archive/v2.14.3.tar.gz
-      source: https://people.canonical.com/~rbasak/git-ubuntu/github-git-v2.14.3.tar.gz
-      source-type: tar
-      source-checksum: sha384/0d28faa4cc66b81ab262f44433b24261cbd39851648723d6701dd5463ab8fb6989b18d46523a4e238a697a1ef78db938
-      build-packages:
-        - libz-dev
-        - gettext
-        - libpcre3-dev
-        - libcurl4-gnutls-dev
-        - libexpat1-dev
-        - libyaml-perl
-        - tcl
-        - libhttp-date-perl
-        - libcgi-pm-perl
-        - libdbd-sqlite3-perl
-        - unzip
-        - libio-pty-perl
-   dpkg:
-      plugin: autotools
-      # generated with, in a Bionic container:
-      # sudo apt update && sudo apt -y install autoconf autopoint pkg-config libtool libncursesw5-dev gettext po4a
-      # git clone https://anonscm.debian.org/git/dpkg/dpkg.git -b 1.18.24
-      # cd dpkg
-      # autoreconf -f -i
-      # ./configure
-      # make dist
-      source: https://people.canonical.com/~rbasak/git-ubuntu/dpkg-1.18.24.tar.xz
-      source-type: tar
-      source-checksum: sha384/54539fcf0f303ac4a2cff70f3f8fcf01325d2f84e757de02812d54d7603475c750b72380fab41b135930d5726c7dc541
-      configflags:
-         - --prefix=/usr
-         - --sysconfdir=/etc
-         - --sbindir=/sbinn
-         - --localstatedir=/var
-         - --libexecdir=${exec_prefix/lib}
-      build-packages:
-        - pkg-config
-        - libncursesw5-dev
-   xz-utils:
-      plugin: autotools
-      # from https://github.com/xz-mirror/xz/releases/download/v5.2.2/xz-5.2.2.tar.xz
-      source: https://people.canonical.com/~rbasak/git-ubuntu/xz-5.2.2.tar.xz
-      source-type: tar
-      source-checksum: sha384/ccb584d0325497eb4c7dbba930c0fff388efe2cbc3636507ba654084948965cc18325ca4835f972c8083db4e381fbbdc
-      configflags: [--prefix=/usr]
-      after: [dpkg]
-   tar:
-      plugin: x-tar
-      # from https://ftp.gnu.org/gnu/tar/tar-1.29.tar.xz
-      source: https://people.canonical.com/~rbasak/git-ubuntu/tar-1.29.tar.xz
-      source-type: tar
-      source-checksum: sha384/b7d517a81a74c649893cb56958a06edabca7e6c67df9ec5c9c67b974216a4ef2e0eb427dc6d1e1a80c91c89e0b6ac751
-      after: [xz-utils]
-   xdelta:
-      plugin: autotools
-      # generated with
-      # git clone https://anonscm.debian.org/git/users/lamont/xdelta.git -b v1.1.3-9
-      # cd xdelta
-      # git archive --prefix xdelta-$(git describe)/ -o ../xdelta-$(git describe).tar.gz HEAD
-      source: https://people.canonical.com/~rbasak/git-ubuntu/xdelta-v1.1.3-9.tar.gz
-      source-type: tar
-      source-checksum: sha384/441b051fb9a4941ffb49efb0e82184227c9a9299cdd63d5d814f27f0017bceb2ef624615448268d34edaf696604fe62e
-      build-packages:
-         - libtool-bin
-         - libglib2.0-dev
-         - zlib1g-dev
-   xdelta3:
-      plugin: autotools
-      # from https://github.com/jmacd/xdelta/archive/v3.0.11.tar.gz
-      source: https://people.canonical.com/~rbasak/git-ubuntu/github-jmacd-xdelta-v3.0.11.tar.gz
-      source-type: tar
-      source-checksum: sha384/c1c0b70aa064b5bd02857d3547720fb3581752882e1ebb7391afb8e270e10b654a8b7bcf114ac1073c2787c9a115c03b
-      build: |
-         cd xdelta3
-         ./run_release.sh || true
-         ./run_release.sh || true
-         autoreconf
-         ./configure --prefix=$SNAPCRAFT_PART_INSTALL/usr
-         make
-      install: |
-         cd xdelta3
-         make install
-      after: [xz-utils]
-   pristine-tar:
-      plugin: make
-      # generated with
-      # git clone https://anonscm.debian.org/cgit/collab-maint/pristine-tar.git -b 1.41
-      # cd pristine-tar
-      # # git describe can't be used due to upstream tag issue
-      # git archive --prefix pristine-tar-1.41/ -o ../pristine-tar-1.41.tar.gz HEAD
-      source: https://people.canonical.com/~rbasak/git-ubuntu/pristine-tar-1.41.tar.gz
-      source-type: tar
-      source-checksum: sha384/0c202500d368051711bd7e827a29a6d93f9eba37ddee4950e1b24d510d9347635111b4e7dc716bd837a7f5c4d40e6238
-      prepare: |
-         perl Makefile.PL PREFIX=/usr
-      after: [git, tar, xdelta3]
-   launchpadlib:
-      plugin: python
-      python-version: python3
-      # from https://launchpad.net/ubuntu/+source/python-launchpadlib/1.10.6-1
-      source: https://launchpad.net/ubuntu/+archive/primary/+files/python-launchpadlib_1.10.6.orig.tar.gz
-      source-type: tar
-      source-checksum: sha384/fd87f3f02e86179e8bc8e07f52ca8aad59db93c7dd53057198b77fe4591593cda4a29d935b6e8a8386f6f6ddb83d4762
-      build-packages:
-         - libffi-dev
-      stage:
-         - -usr/bin/py*
-         - -usr/bin/2to3*
-         - -usr/share/*python*
-         - -usr/lib/python3.5
-         - -usr/lib/python3.6
-         - -lib/python3.6/site-packages/keyring
-      after: [python3]
-   python2:
-      # from http://www.python.org/ftp/python/2.7.14/Python-2.7.14.tar.xz
-      source: https://people.canonical.com/~rbasak/git-ubuntu/Python-2.7.14.tar.xz
-      source-type: tar
-      source-checksum: sha384/b5f8304a9f3f368625798cb6c9ba0d1fa4b3142f83f5039d8de59e9f70a36c4250a734f27ec27c16268dc8f9502c007e
-      plugin: autotools
-      configflags: [--prefix=/usr]
-      build-packages:
-         - libssl-dev
-         - libsqlite3-dev
-      stage:
-         - -usr/bin/2to3*
-         - -usr/lib/python2.7/test
-      # need it at runtime, but want to build it using the stage
-      # packages
-      after: [ubuntutools-python2]
-   python3:
-      # from http://www.python.org/ftp/python/3.6.3/Python-3.6.3.tar.xz
-      source: https://people.canonical.com/~rbasak/git-ubuntu/Python-3.6.3.tar.xz
-      source-type: tar
-      source-checksum: sha384/72597cc86c893031af194404c97c5e15114cfb75833fab0dc53b4bc08f5928b094d5b4d405edc9543087970944790f70
-      plugin: autotools
-      configflags: [--prefix=/usr]
-      build-packages:
-         - libssl-dev
-         - libsqlite3-dev
-         - libbz2-dev
-         - liblzma-dev
-         - libdb-dev
-         - libgdbm-dev
-         - libreadline-dev
-      stage:
-         - -usr/lib/python3.6/test
-   ubuntutools-python2:
-      plugin: python
-      python-version: python2
-      # generated with
-      # git clone https://git.launchpad.net/ubuntu-dev-tools -b 0.161
-      # cd ubuntu-dev-tools
-      # git archive --prefix ubuntu-dev-tools-$(git describe)/ -o ../ubuntu-dev-tools-$(git describe).tar.gz HEAD
-      source: https://people.canonical.com/~rbasak/git-ubuntu/ubuntu-dev-tools-0.161.tar.gz
-      source-checksum: sha384/98fe630d6f644155b49b15c57b5d4f9f47bd918cc074359f5b5ac3fa283506b8fc2d557127f1b47dd2bd66e681c17104
-      stage:
-         - -bin/*
-         - -usr/bin/*
-         - -share/man/*
-         - -share/ubuntu-dev-tools/enforced-editing-wrapper
-         - -usr/share/*python*
-         - -lib/python2.7/site-packages/oauth*
-         - -usr/lib/python2.7
-   ubuntutools-python3:
-      plugin: python
-      python-version: python3
-      # generated with
-      # git clone https://git.launchpad.net/ubuntu-dev-tools -b 0.176
-      # cd ubuntu-dev-tools
-      # git archive --prefix ubuntu-dev-tools-$(git describe)/ -o ../ubuntu-dev-tools-$(git describe).tar.gz HEAD
-      source: https://people.canonical.com/~rbasak/git-ubuntu/ubuntu-dev-tools-0.176.tar.gz
-      source-checksum: sha384/24c255fcebe48ad6bdc6aa4cf197753b4c1683bb70458c2170593f70e8820911d61632cd99ec48f540eadad3ba5a9f56
-      stage:
-         - -usr/bin/py*
-         - -usr/bin/2to3*
-         - -usr/share/*python*
-         - -lib/python3.5/site-packages/oauth*
-         - -lib/python3.6/site-packages/oauth*
-         - -usr/lib/python3.5
-         - -usr/lib/python3.6
-      after: [python3]
-   distro-info:
-      plugin: python
-      python-version: python3
-      # generated with
-      # git clone https://anonscm.debian.org/git/collab-maint/distro-info.git -b debian/0.17
-      # cd distro-info
-      # #can't use git describe because of the upstream tag names
-      # git archive --prefix distro-info-0.17/ -o ../distro-info-0.17.tar.gz HEAD
-      source: https://people.canonical.com/~rbasak/git-ubuntu/distro-info-0.17.tar.gz
-      source-checksum: sha384/2192b97c15a5c1669ac8acdcaa37766a3898b440b14156422bef322dc4f42b2159f2ec87e49e818801bde0f0c359cb38
-      source-subdir: python
-      stage:
-         - -usr/bin/py*
-         - -usr/bin/2to3*
-         - -usr/share/*python*
-         - -usr/lib/python3.5
-         - -usr/lib/python3.6
-      stage-packages:
-         - distro-info
-      after: [python3]
-   libgpg-error:
-      plugin: autotools
-      # from https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2
-      source: https://people.canonical.com/~rbasak/git-ubuntu/libgpg-error-1.27.tar.bz2
-      source-type: tar
-      source-checksum: sha384/cf2e9e7ce6b5ed993b3f8f1d45f1d72b07a30544533142c48f1515d9fc1638fe976c639febca0b838489f6c34dc2f36d
-      configflags: [--prefix=/usr]
-      stage:
-         - -usr/share/info
-   libgcrypt:
-      plugin: autotools
-      # from https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.1.tar.bz2
-      source: https://people.canonical.com/~rbasak/git-ubuntu/libgcrypt-1.8.1.tar.bz2
-      source-type: tar
-      source-checksum: sha384/823b1e4a0c8d5dad5aabe0b192a92734ed95ccb3ba468483b3b6cd2765157458b620db0b020739d15397ddad81a93a3e
-      configflags: [--prefix=/usr]
-      stage:
-         - -usr/share/info
-   libassuan:
-      plugin: autotools
-      # from https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.1.tar.bz2
-      source: https://people.canonical.com/~rbasak/git-ubuntu/libassuan-2.5.1.tar.bz2
-      source-type: tar
-      source-checksum: sha384/e9bf675bd385e5bbe3fa8edf5632715b2fad67877c185ed12777caa6e985b2b967ccd836132ac3d28a10319057874d3d
-      configflags: [--prefix=/usr]
-      after: [libgpg-error]
-      stage:
-         - -usr/share/info
-   libksba:
-      plugin: autotools
-      # from https://gnupg.org/ftp/gcrypt/libksba/libksba-1.3.5.tar.bz2
-      source: https://people.canonical.com/~rbasak/git-ubuntu/libksba-1.3.5.tar.bz2
-      source-type: tar
-      source-checksum: sha384/7264394452d4ee0da9014949abd5b163d928a1c1216b7008653e04d6090d3cfad2a0a978e7159cee599a319cc5d7f574
-      configflags: [--prefix=/usr]
-      stage:
-         - -usr/share/info
-   npth:
-      plugin:  autotools
-      # from https://gnupg.org/ftp/gcrypt/npth/npth-1.5.tar.bz2
-      source: https://people.canonical.com/~rbasak/git-ubuntu/npth-1.5.tar.bz2
-      source-type: tar
-      source-checksum: sha384/48533ecf32da9b02a0f627c074479c211b75ee2bc005aa75157ea9e119e6ede38fe7dadfc0f64eb5b937edfec033a8bc
-      configflags: [--prefix=/usr]
-      stage:
-         - -usr/share/info
-   gnupg2:
-      plugin: autotools
-      # from https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.4.tar.bz2
-      source: https://people.canonical.com/~rbasak/git-ubuntu/gnupg-2.2.4.tar.bz2
-      source-type: tar
-      source-checksum: sha384/94926c62260c2a9552015ca155935a61578b1f3b06d3dbf080414007b95ceb2008bf0f86f69e0ea22996d27974befd9c
-      configflags:
-         - --prefix=/usr
-         - --enable-gpg2-is-gpg
-      after:
-         - libgpg-error
-         - libgcrypt
-         - libassuan
-         - libksba
-         - npth
-      stage:
-         - -usr/share/info
-   devscripts:
-      plugin: nil
-      stage-packages:
-         - devscripts
-      stage:
-         - -usr/share/perl5/Dpkg*
-         - -usr/bin/dpkg*
-         - -usr/share/dpkg
-         - -usr/bin/py*
-         - -usr/bin/2to3*
-         - -usr/share/*python*
-         - -usr/lib/python3.5
-         - -usr/lib/python3.6
-         - -usr/bin/lzmainfo
-         - -usr/bin/xz
-         - -usr/bin/xzdiff
-         - -usr/bin/xzgrep
-         - -usr/bin/xzless
-         - -usr/bin/xzmore
-      after: [gnupg2]
-   git-ubuntu:
-      plugin: python
-      python-version: python3
-      source: .
-      build-packages:
-         - libsystemd-dev
-      stage-packages:
-         - bash
-         - fakeroot
-         - libffi-dev
-         - libssl-dev
-         - libgit2-dev
-         - libssh2-1-dev
-         - libzmq3-dev
-         - sendmail-bin
-         - quilt
-         - man-db
-         - pbzip2
-         - bzip2
-         - python3-systemd
-      stage:
-         - -usr/bin/py*
-         - -usr/bin/2to3*
-         - -usr/share/*python*
-         - -lib/python3.6/site-packages/oauth*
-         - -lib/python3.6/site-packages/launchpadlib*
-         - -lib/python3.6/site-packages/lazr/restfulclient*
-         - -usr/lib/python3.6
-         - -usr/bin/gpg-error*
-         - -usr/share/aclocal/gpg-error.m4
-         - -usr/lib/*/*gpg-error*
-         - -lib/*/*gpg-error*
-         - -usr/bin/dumpsexp
-         - -usr/bin/hmac256
-         - -usr/bin/libgcrypt-config
-         - -usr/lib/*/*libgcrypt*
-         - -lib/*/*libcrypt*
-         - -usr/bin/mpicalc
-         - -usr/include/gcrypt.h
-         - -usr/share/aclocal/libgcrypt.m4
-         - -lib/python3.6/site-packages/cryptography/hazmat/bindings/_constant_time.abi3.so
-         - -lib/python3.6/site-packages/cryptography/hazmat/bindings/_openssl.abi3.so
-         - -lib/python3.6/site-packages/cryptography/hazmat/bindings/_padding.abi3.so
-      prime:
-         - -usr/share/doc
-      install: |
-         # Make $SNAP/etc/pylintrc available to git-ubuntu.self-test
-         cp ../../../.pylintrc $SNAPCRAFT_PART_INSTALL/etc/pylintrc
+# package-repositories is inserted here by snap.sh
+# See LP: #1918968 and snap.sh
 
-         cp $SNAPCRAFT_PART_INSTALL/usr/bin/fakeroot-sysv $SNAPCRAFT_PART_INSTALL/usr/bin/fakeroot
-      after:
-         - gbp
-         - pristine-tar
-         - distro-info
-         - ubuntutools-python2
-         - ubuntutools-python3
-         - python3
-         - devscripts
-         - launchpadlib
-   wrappers:
-      source: snap-wrappers/
-      plugin: dump
-      organize:
-         wrappers/gbp: usr/local/bin/gbp
-         wrappers/quilt: usr/local/bin/quilt
-         wrappers/awk: usr/local/bin/awk
-         wrappers/ssh: usr/local/bin/ssh
-   manpages:
-      source: man/
-      plugin: dump
-      organize:
-         man1: usr/share/man/man1
-   completion:
-      source: doc/
-      plugin: dump
-      organize:
-         gitubuntu-completion.sh: etc/bash_completion.d/git-ubuntu
-   scripts:
-      source: bin/
-      plugin: dump
-      organize:
-         git-reconstruct-changelog: bin/git-reconstruct-changelog
-         git-merge-changelogs: bin/git-merge-changelogs
-         import-source-packages.py: bin/import-source-packages.py
-         source-package-walker.py: bin/source-package-walker.py
-         update-repository-alias.py: bin/update-repository-alias.py
-   # Short-term workaround for the archive keyrings in older releases
-   # not being updated. Once the keyring packages are SRU'd, this can be
-   # dropped. LP: #1752656
-   debian-archive-keyring:
-      plugin: dump
-      source: https://launchpad.net/ubuntu/+source/debian-archive-keyring/2019.1ubuntu2/+build/17235516/+files/debian-archive-keyring_2019.1ubuntu2_all.deb
-      source-type: deb
-      source-checksum: sha384/907e9ef7db90fdc456906ef4ac52f9e92b36f9528c8c1968ab63a5f0e87ea6bdfbebda66df84ca5265c56a55c68cd78c
-   ubuntu-keyring:
-      plugin: dump
-      source: https://launchpad.net/ubuntu/+source/ubuntu-keyring/2018.09.18.1/+build/15467225/+files/ubuntu-keyring_2018.09.18.1_all.deb
-      source-type: deb
-      source-checksum: sha384/7dc92ccfeb9bb7fc8e0dfa80b96f9706438fd148683f6df092ba6f1a926aceb0e2aeb0e019625683d84022ba1413e5a4
+parts:
+    git-ubuntu:
+        plugin: nil
+        override-prime: |
+            snapcraftctl prime
+            ln -s mawk usr/bin/awk
+        stage:
+            # Remove etc/rmt due to:
+            #     The store was unable to accept this snap.
+            #       - package contains external symlinks: etc/rmt
+            - -etc/rmt
+        stage-packages:
+            - git-ubuntu
+            - debian-keyring
+            - git
+            - git-buildpackage
+            - pristine-tar
+            - pylint
+            - quilt
+            - ubuntu-keyring
+            - libpython3-stdlib
+            - libpython3.8-stdlib
+            - libpython3.8-minimal
+            - python3-pip
+            - python3-setuptools
+            - python3-wheel
+            - python3-venv
+            - python3-minimal
+            - python3-distutils
+            - python3-pkg-resources
+            - python3.8-minimal
+            - python3-six
+            - python3-chardet
+            - python3-oauthlib
+            - python3-cffi-backend
+            - python3-attr
+            - python3-more-itertools
+            - python3-testresources
+            - grep
+            - coreutils
+            - gzip
+            - tar
+            - sed
+            - bash
+            - util-linux
+            - awk
+            - mawk
+            - findutils
+            - dpkg
+            - dpkg-dev
+            - gpgv
+    wrappers:
+        source: snap-wrappers/
+        plugin: dump
+        organize:
+            wrappers/ssh: usr/local/bin/ssh
+            wrappers/gbp: usr/local/bin/gbp
+            wrappers/quilt: usr/local/bin/quilt