Coding style.

- Removed dead code.

make-appimage.py

@@ -3,14 +3,16 @@
 
 import os
 import pickle
+import subprocess
 import sys
 import tempfile
 
-import test_distributions
-
 
 ERIS_PATH = os.path.realpath(os.path.dirname(__file__))
-cmd = test_distributions.cmd
+
+
+def cmd(command):
+    subprocess.run(command, shell=True, check=True)
 
 
 def all_paths(path):
@@ -39,12 +41,26 @@ def filter_paths(paths, exclusions):
             if all(excluded not in path for excluded in exclusions)]
 
 
+def run_in_container(container, command):
+    option = "--directory" if os.path.isdir(container) else "--image"
+    cmd(f"sudo systemd-nspawn --quiet --chdir=/eris --overlay={ERIS_PATH}:"
+        f'/eris {option}={container} /bin/bash --login -c "{command}"')
+
+
+def build_ubuntu():
+    cmd("sudo debootstrap --components=main,restricted,universe,multiverse "
+        "impish ubuntu.part http://au.archive.ubuntu.com/ubuntu/")
+    run_in_container("ubuntu.part",
+                     "ln -sf /lib/systemd/resolv.conf /etc/resolv.conf")
+    os.rename("ubuntu.part", "ubuntu")
+
+
 def make_ubuntu_base():
     if os.path.exists("base_paths"):
         with open("base_paths", "rb") as file_:
             base_paths = pickle.load(file_)
     else:
-        test_distributions.build_ubuntu()
+        build_ubuntu()
         base_paths = relative_paths("ubuntu", all_paths("ubuntu"))
         base_paths = filter_paths(base_paths, ["python3"])
         with open("base_paths", "wb") as file_:
@@ -53,7 +69,6 @@ def make_ubuntu_base():
 
 
 def install_eris():
-    run_in_container = test_distributions.run_in_container
     run_in_container("ubuntu", "./install-dependencies")
     run_in_container("ubuntu", "pip3 install -I .")
 

test_distributions.py

@@ -1,151 +0,0 @@
-#!/usr/bin/env python3.9
-
-
-import os
-import subprocess
-import sys
-import tempfile
-
-
-ERIS_PATH = os.path.realpath(os.path.dirname(__file__))
-
-
-def cmd(command):
-    subprocess.run(command, shell=True, check=True)
-
-
-def mount_squashfs_iso(iso, squashfs_path, mount_point):
-    cmd(f"mkdir iso && sudo mount -o loop {iso} iso")
-    cmd(f"mkdir lower && sudo mount -t squashfs iso/{squashfs_path} lower")
-    cmd(f"mkdir upper work {mount_point} && sudo mount -t overlay "
-        f"-o lowerdir=lower,upperdir=upper,workdir=work overlay {mount_point}")
-
-
-def umount_squashfs_iso(mount_point):
-    cmd(f"sudo umount {mount_point} && sudo rm -rf upper work {mount_point}")
-    cmd("sudo umount lower && rmdir lower")
-    cmd("sudo umount iso && rmdir iso")
-
-
-def run_in_container(container, command):
-    option = "--directory" if os.path.isdir(container) else "--image"
-    cmd(f"sudo systemd-nspawn --quiet --chdir=/eris --overlay={ERIS_PATH}:"
-        f'/eris {option}={container} /bin/bash --login -c "{command}"')
-
-
-def build_ubuntu():
-    cmd("sudo debootstrap --components=main,restricted,universe,multiverse "
-        "impish ubuntu.part http://au.archive.ubuntu.com/ubuntu/")
-    run_in_container("ubuntu.part",
-                     "ln -sf /lib/systemd/resolv.conf /etc/resolv.conf")
-    os.rename("ubuntu.part", "ubuntu")
-
-
-def build_fedora():
-    image = "Fedora-Cloud-Base-25-1.3.x86_64.raw"
-    cmd("wget --continue https://dl.fedoraproject.org/pub/fedora/linux/"
-        f"releases/25/CloudImages/x86_64/images/{image}.xz")
-    cmd(f"unxz {image}.xz")
-    os.rename(image, "fedora")
-
-
-def build_debian():
-    cmd("sudo debootstrap --components=main,contrib,non-free "
-        "--include=sudo jessie debian.part")
-    os.rename("debian.part", "debian")
-
-
-ARCHLINUX_ISO = "archlinux-2017.06.01-x86_64.iso"
-
-
-def build_archlinux():
-    cmd("wget --continue http://mirrors.kernel.org/archlinux/iso/2017.06.01/"
-        + ARCHLINUX_ISO)
-    mount_squashfs_iso(ARCHLINUX_ISO, "arch/x86_64/airootfs.sfs", "archlinux")
-    run_in_container("archlinux", "pacman-key --init")
-    run_in_container("archlinux", "pacman-key --populate archlinux")
-    run_in_container("archlinux", "pacman -Syyu --noconfirm")
-
-
-def remove_archlinux():
-    umount_squashfs_iso("archlinux")
-    os.remove(ARCHLINUX_ISO)
-
-
-OPENSUSE_ISO = "openSUSE-Tumbleweed-GNOME-Live-x86_64-Current.iso"
-
-
-def build_opensuse():
-    cmd("wget --continue https://download.opensuse.org/tumbleweed/iso/"
-        + OPENSUSE_ISO)
-    mount_squashfs_iso(OPENSUSE_ISO, "openSUSE-tumbleweed-livecd-gnome"
-                       "-read-only.x86_64-2.8.0", "opensuse")
-
-
-def remove_opensuse():
-    umount_squashfs_iso("opensuse")
-    os.remove(OPENSUSE_ISO)
-
-
-PIXEL_ISO = "2016-12-13-pixel-x86-jessie.iso"
-
-
-def build_pixel():
-    cmd("wget --continue http://downloads.raspberrypi.org/pixel_x86/images/"
-        "pixel_x86-2016-12-13/" + PIXEL_ISO)
-    mount_squashfs_iso(PIXEL_ISO, "live/filesystem.squashfs", "pixel")
-    cmd("sudo rm pixel/etc/resolv.conf")
-    cmd("echo 'nameserver 127.0.0.53' | sudo dd of=pixel/etc/resolv.conf")
-    run_in_container("pixel", "apt-get update")
-
-
-def remove_pixel():
-    umount_squashfs_iso("pixel")
-    os.remove(PIXEL_ISO)
-
-
-def build_gentoo():
-    tar_file = "stage3-amd64-20170525.tar.bz2"
-    cmd("wget --continue http://distfiles.gentoo.org/releases/amd64/"
-        "autobuilds/20170525/" + tar_file)
-    cmd("mkdir -p gentoo.part")
-    cmd("sudo tar --directory=gentoo.part -xjf " + tar_file)
-    os.remove(tar_file)
-    run_in_container("gentoo.part", "emerge --sync")
-    run_in_container("gentoo.part", "emerge sudo")
-    os.rename("gentoo.part", "gentoo")
-
-
-def main():
-    work_path = (tempfile.mkdtemp(prefix="test_distributions-")
-                 if len(sys.argv) == 1 else sys.argv[1])
-    os.chdir(work_path)
-    cmd("sudo apt-get install -y systemd-container debootstrap xz-utils wget")
-    # FIX: Reenable: fedora debian archlinux opensuse pixel gentoo
-    for distribution in ["ubuntu"]:
-        if os.path.exists(distribution):
-            print(distribution, "container already exists.")
-        else:
-            print(f"Building {distribution} container…")
-            globals()["build_" + distribution]()
-        print(f"Installing eris's dependencies in {distribution}…")
-        run_in_container(distribution, "./install-dependencies")
-        print(f"Installing eris in {distribution}…")
-        run_in_container(distribution, "apt-get install --yes python3-pip")
-        run_in_container(distribution, "pip3 install .")
-        print(f"Testing eris in {distribution}…")
-        run_in_container(distribution, "./test-all")
-        print(f"Running eris in {distribution}…")
-        run_in_container(distribution, "eris --help")
-        print(f"Successfully installed eris in {distribution}.")
-        print(f"Removing {distribution} container…")
-        try:
-            globals()["remove_" + distribution]()
-        except KeyError:
-            cmd("sudo rm -rf " + distribution)
-    os.rmdir(work_path)
-    print("Finished.")
-
-
-if __name__ == "__main__":
-    main()