Merge ~xnox/germinate:focal-amd64-default into germinate:master

[Dimitri John Ledkov]

Switch defaults to focal/amd64

focal is the next LTS.

And i386 is no longer the best default arch, as amd64 one has more packages published.

Not sure if you want d/changelog entry too, or if it will be generated using gbp dch.

[Colin Watson (cjwatson)]

This breaks tests (try running "tox"). Could you please fix that?

I normally add changelog entries when merging individual changes rather than with "gbp dch" or similar, but I don't much mind whether you do that here or whether I do it at merge time.

review: Needs Fixing

4fc78b2... by Dimitri John Ledkov on 2019-11-20

Update manpages

f8d96e9... by Dimitri John Ledkov on 2019-11-20

Update testsuite

cd5ad6f... by Dimitri John Ledkov on 2019-11-20

Add py38 to tox.ini

384bef5... by Dimitri John Ledkov on 2019-11-20

Changelog

[Dimitri John Ledkov (xnox)]

Now testsuite passes.

Not sure, if I should be fixing up the testsuite to be explicit about architectures & suites, such that it doesn't break on defaults updates.

[Colin Watson (cjwatson)]

It doesn't exactly come up very often, so I think this is fine.

But there are still a couple of places in man/ that claim that the default architecture is i386. Could you update those?

8eb449f... by Dimitri John Ledkov on 2019-11-20

Update i386->amd64 in more places

Unmerged commits

8eb449f... by Dimitri John Ledkov on 2019-11-20

Update i386->amd64 in more places

384bef5... by Dimitri John Ledkov on 2019-11-20

Changelog

cd5ad6f... by Dimitri John Ledkov on 2019-11-20

Add py38 to tox.ini

f8d96e9... by Dimitri John Ledkov on 2019-11-20

Update testsuite

4fc78b2... by Dimitri John Ledkov on 2019-11-20

Update manpages

e28a6ec... by Dimitri John Ledkov on 2019-10-30

Change defaults to focal/amd64

diff --git a/debian/changelog b/debian/changelog
index ce2e126..0e4cdb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+germinate (2.33) UNRELEASED; urgency=medium
+
+  * Change defaults from bionic/i386 to focal/amd64.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 20 Nov 2019 14:56:35 +0000
+
 germinate (2.32) unstable; urgency=medium
 
   * Remove ancient X-Python-Version and X-Python3-Version fields.
diff --git a/germinate/defaults.py b/germinate/defaults.py
index d7d15fc..2d88f9a 100644
--- a/germinate/defaults.py
+++ b/germinate/defaults.py
@@ -22,10 +22,10 @@
 seeds = 'http://people.canonical.com/~ubuntu-archive/seeds/'
 seeds_bzr = 'http://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/'
 seeds_git = 'git://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/'
-release = 'ubuntu.bionic'
+release = 'ubuntu.focal'
 
 # If we need to download Packages.gz and/or Sources.gz, where do we get
 # them from?
 mirror = 'http://archive.ubuntu.com/ubuntu/'
-dist = 'bionic'
-arch = 'i386'
+dist = 'focal'
+arch = 'amd64'
diff --git a/germinate/tests/test_archive.py b/germinate/tests/test_archive.py
index 6e1d70e..803cd05 100644
--- a/germinate/tests/test_archive.py
+++ b/germinate/tests/test_archive.py
@@ -53,7 +53,7 @@ class TestTagFile(TestCase):
         """Test fetching sections from a basic TagFile archive using gzip."""
         self.useTempDir()
         main_dir = os.path.join("mirror", "dists", "unstable", "main")
-        binary_dir = os.path.join(main_dir, "binary-i386")
+        binary_dir = os.path.join(main_dir, "binary-amd64")
         source_dir = os.path.join(main_dir, "source")
         os.makedirs(binary_dir)
         os.makedirs(source_dir)
@@ -62,7 +62,7 @@ class TestTagFile(TestCase):
             packages.write(textwrap.dedent(u"""\
                 Package: test
                 Version: 1.0
-                Architecture: i386
+                Architecture: amd64
                 Maintainer: úḃúñŧů đəvẽłõṗèŗṡ
 
                 """).encode("UTF-8"))
@@ -75,12 +75,12 @@ class TestTagFile(TestCase):
                 """).encode("UTF-8"))
 
         tagfile = TagFile(
-            "unstable", "main", "i386", "file://%s/mirror" % self.temp_dir)
+            "unstable", "main", "amd64", "file://%s/mirror" % self.temp_dir)
         sections = list(tagfile.sections())
         self.assertEqual(IndexType.PACKAGES, sections[0][0])
         self.assertEqual("test", sections[0][1]["Package"])
         self.assertEqual("1.0", sections[0][1]["Version"])
-        self.assertEqual("i386", sections[0][1]["Architecture"])
+        self.assertEqual("amd64", sections[0][1]["Architecture"])
         self.assertEqual(IndexType.SOURCES, sections[1][0])
         self.assertEqual("test", sections[1][1]["Source"])
         self.assertEqual("1.0", sections[1][1]["Version"])
@@ -89,7 +89,7 @@ class TestTagFile(TestCase):
         """Test fetching sections from a basic TagFile archive using bzip2."""
         self.useTempDir()
         main_dir = os.path.join("mirror", "dists", "unstable", "main")
-        binary_dir = os.path.join(main_dir, "binary-i386")
+        binary_dir = os.path.join(main_dir, "binary-amd64")
         source_dir = os.path.join(main_dir, "source")
         os.makedirs(binary_dir)
         os.makedirs(source_dir)
@@ -98,7 +98,7 @@ class TestTagFile(TestCase):
             packages.write(textwrap.dedent(u"""\
                 Package: test
                 Version: 1.0
-                Architecture: i386
+                Architecture: amd64
                 Maintainer: úḃúñŧů đəvẽłõṗèŗṡ
 
                 """).encode("UTF-8"))
@@ -111,12 +111,12 @@ class TestTagFile(TestCase):
                 """).encode("UTF-8"))
 
         tagfile = TagFile(
-            "unstable", "main", "i386", "file://%s/mirror" % self.temp_dir)
+            "unstable", "main", "amd64", "file://%s/mirror" % self.temp_dir)
         sections = list(tagfile.sections())
         self.assertEqual(IndexType.PACKAGES, sections[0][0])
         self.assertEqual("test", sections[0][1]["Package"])
         self.assertEqual("1.0", sections[0][1]["Version"])
-        self.assertEqual("i386", sections[0][1]["Architecture"])
+        self.assertEqual("amd64", sections[0][1]["Architecture"])
         self.assertEqual(IndexType.SOURCES, sections[1][0])
         self.assertEqual("test", sections[1][1]["Source"])
         self.assertEqual("1.0", sections[1][1]["Version"])
@@ -125,7 +125,7 @@ class TestTagFile(TestCase):
         """Test fetching sections from a basic TagFile archive using xz."""
         self.useTempDir()
         main_dir = os.path.join("mirror", "dists", "unstable", "main")
-        binary_dir = os.path.join(main_dir, "binary-i386")
+        binary_dir = os.path.join(main_dir, "binary-amd64")
         source_dir = os.path.join(main_dir, "source")
         os.makedirs(binary_dir)
         os.makedirs(source_dir)
@@ -133,7 +133,7 @@ class TestTagFile(TestCase):
             packages.write(textwrap.dedent(u"""\
                 Package: test
                 Version: 1.0
-                Architecture: i386
+                Architecture: amd64
                 Maintainer: úḃúñŧů đəvẽłõṗèŗṡ
 
                 """).encode("UTF-8"))
@@ -147,12 +147,12 @@ class TestTagFile(TestCase):
         subprocess.check_call(["xz", os.path.join(source_dir, "Sources")])
 
         tagfile = TagFile(
-            "unstable", "main", "i386", "file://%s/mirror" % self.temp_dir)
+            "unstable", "main", "amd64", "file://%s/mirror" % self.temp_dir)
         sections = list(tagfile.sections())
         self.assertEqual(IndexType.PACKAGES, sections[0][0])
         self.assertEqual("test", sections[0][1]["Package"])
         self.assertEqual("1.0", sections[0][1]["Version"])
-        self.assertEqual("i386", sections[0][1]["Architecture"])
+        self.assertEqual("amd64", sections[0][1]["Architecture"])
         self.assertEqual(IndexType.SOURCES, sections[1][0])
         self.assertEqual("test", sections[1][1]["Source"])
         self.assertEqual("1.0", sections[1][1]["Version"])
diff --git a/germinate/tests/test_germinator.py b/germinate/tests/test_germinator.py
index 5b84c63..d585fe4 100644
--- a/germinate/tests/test_germinator.py
+++ b/germinate/tests/test_germinator.py
@@ -103,7 +103,7 @@ class TestGerminatedSeed(TestCase):
         self.addSeedPackage(two, "desktop", "desktop")
         structure_one = self.openSeedStructure(one)
         structure_two = self.openSeedStructure(two)
-        germinator = Germinator("i386")
+        germinator = Germinator("amd64")
         desktop_one = GerminatedSeed(
             germinator, "desktop", structure_one, structure_one["desktop"])
         desktop_two = GerminatedSeed(
@@ -124,7 +124,7 @@ class TestGerminatedSeed(TestCase):
         self.addSeedPackage(two, "desktop", "desktop")
         structure_one = self.openSeedStructure(one)
         structure_two = self.openSeedStructure(two)
-        germinator = Germinator("i386")
+        germinator = Germinator("amd64")
         desktop_one = GerminatedSeed(
             germinator, "desktop", structure_one, structure_one["desktop"])
         desktop_two = GerminatedSeed(
@@ -138,18 +138,18 @@ class TestGerminator(TestCase):
         self.addSource("warty", "main", "hello", "1.0-1",
                        ["hello", "hello-dependency"],
                        fields={"Maintainer": "Test Person <[e-mail]>"})
-        self.addPackage("warty", "main", "i386", "hello", "1.0-1",
+        self.addPackage("warty", "main", "amd64", "hello", "1.0-1",
                         fields={
                             "Maintainer": "Test Person <[e-mail]>",
                             "Depends": "hello-dependency",
                             })
-        self.addPackage("warty", "main", "i386", "hello-dependency", "1.0-1",
+        self.addPackage("warty", "main", "amd64", "hello-dependency", "1.0-1",
                         fields={"Source": "hello", "Multi-Arch": "foreign"})
         self.addSeed("ubuntu.warty", "supported")
         self.addSeedPackage("ubuntu.warty", "supported", "hello")
-        germinator = Germinator("i386")
+        germinator = Germinator("amd64")
         archive = TagFile(
-            "warty", "main", "i386", "file://%s" % self.archive_dir)
+            "warty", "main", "amd64", "file://%s" % self.archive_dir)
         germinator.parse_archive(archive)
 
         self.assertIn("hello", germinator._sources)
@@ -202,14 +202,14 @@ class TestGerminator(TestCase):
     def test_different_providers_between_suites(self):
         """Provides from later versions override those from earlier ones."""
         self.addSource("warty", "main", "hello", "1.0-1", ["hello"])
-        self.addPackage("warty", "main", "i386", "hello", "1.0-1",
+        self.addPackage("warty", "main", "amd64", "hello", "1.0-1",
                         fields={"Provides": "goodbye"})
         self.addSource("warty-updates", "main", "hello", "1.0-1.1", ["hello"])
-        self.addPackage("warty-updates", "main", "i386", "hello", "1.0-1.1",
+        self.addPackage("warty-updates", "main", "amd64", "hello", "1.0-1.1",
                         fields={"Provides": "hello-goodbye"})
-        germinator = Germinator("i386")
+        germinator = Germinator("amd64")
         archive = TagFile(
-            ["warty", "warty-updates"], "main", "i386",
+            ["warty", "warty-updates"], "main", "amd64",
             "file://%s" % self.archive_dir)
         germinator.parse_archive(archive)
 
@@ -237,21 +237,21 @@ class TestGerminator(TestCase):
                 ("allowed", ":native", False),
                 ):
             self.addSource("precise", "main", "hello", "1.0-1", ["hello"])
-            self.addPackage("precise", "main", "i386", "hello", "1.0-1",
+            self.addPackage("precise", "main", "amd64", "hello", "1.0-1",
                             fields={"Depends": "gettext%s" % qual})
             self.addSource("precise", "main", "gettext", "0.18.1.1-5ubuntu3",
                            ["gettext"])
             package_fields = {}
             if ma is not None:
                 package_fields["Multi-Arch"] = ma
-            self.addPackage("precise", "main", "i386", "gettext",
+            self.addPackage("precise", "main", "amd64", "gettext",
                             "0.18.1.1-5ubuntu3", fields=package_fields)
             branch = "collection.precise"
             self.addSeed(branch, "base")
             self.addSeedPackage(branch, "base", "hello")
-            germinator = Germinator("i386")
+            germinator = Germinator("amd64")
             archive = TagFile(
-                "precise", "main", "i386", "file://%s" % self.archive_dir)
+                "precise", "main", "amd64", "file://%s" % self.archive_dir)
             germinator.parse_archive(archive)
             structure = self.openSeedStructure(branch)
             germinator.plant_seeds(structure)
@@ -290,20 +290,20 @@ class TestGerminator(TestCase):
                 ):
             self.addSource("precise", "main", "hello", "1.0-1", ["hello"],
                            fields={"Build-Depends": "gettext%s" % qual})
-            self.addPackage("precise", "main", "i386", "hello", "1.0-1")
+            self.addPackage("precise", "main", "amd64", "hello", "1.0-1")
             self.addSource("precise", "main", "gettext", "0.18.1.1-5ubuntu3",
                            ["gettext"])
             package_fields = {}
             if ma is not None:
                 package_fields["Multi-Arch"] = ma
-            self.addPackage("precise", "main", "i386", "gettext",
+            self.addPackage("precise", "main", "amd64", "gettext",
                             "0.18.1.1-5ubuntu3", fields=package_fields)
             branch = "collection.precise"
             self.addSeed(branch, "base")
             self.addSeedPackage(branch, "base", "hello")
-            germinator = Germinator("i386")
+            germinator = Germinator("amd64")
             archive = TagFile(
-                "precise", "main", "i386", "file://%s" % self.archive_dir)
+                "precise", "main", "amd64", "file://%s" % self.archive_dir)
             germinator.parse_archive(archive)
             structure = self.openSeedStructure(branch)
             germinator.plant_seeds(structure)
@@ -330,24 +330,24 @@ class TestGerminator(TestCase):
                                "gettext <!stage1> <!cross>, "
                                "base-files <stage1>, "
                                "gettext (<< 0.7) | debhelper (>= 9)"})
-        self.addPackage("precise", "main", "i386", "hello", "1.0-1")
+        self.addPackage("precise", "main", "amd64", "hello", "1.0-1")
         self.addSource("precise", "main", "gettext", "0.8.1.1-5ubuntu3",
                        ["gettext"])
-        self.addPackage("precise", "main", "i386", "gettext",
+        self.addPackage("precise", "main", "amd64", "gettext",
                         "0.8.1.1-5ubuntu3")
         self.addSource("precise", "main", "base-files", "6.5ubuntu6",
                        ["base-files"])
-        self.addPackage("precise", "main", "i386", "base-files", "6.5ubuntu6")
+        self.addPackage("precise", "main", "amd64", "base-files", "6.5ubuntu6")
         self.addSource("precise", "main", "debhelper", "9.20120115ubuntu3",
                        ["debhelper"])
-        self.addPackage("precise", "main", "i386", "debhelper",
+        self.addPackage("precise", "main", "amd64", "debhelper",
                         "9.20120115ubuntu3")
         branch = "collection.precise"
         self.addSeed(branch, "base")
         self.addSeedPackage(branch, "base", "hello")
-        germinator = Germinator("i386")
+        germinator = Germinator("amd64")
         archive = TagFile(
-            "precise", "main", "i386", "file://%s" % self.archive_dir)
+            "precise", "main", "amd64", "file://%s" % self.archive_dir)
         germinator.parse_archive(archive)
         structure = self.openSeedStructure(branch)
         germinator.plant_seeds(structure)
@@ -362,23 +362,23 @@ class TestGerminator(TestCase):
         self.addSource("bionic", "main", "hello", "1.0-1",
                        ["hello", "hello-dependency", "hello-bad"],
                        fields={"Maintainer": "Test Person <[e-mail]>"})
-        self.addPackage("bionic", "main", "i386", "hello", "1.0-1",
+        self.addPackage("bionic", "main", "amd64", "hello", "1.0-1",
                         fields={
                             "Maintainer": "Test Person <[e-mail]>",
                             "Depends": "hello-virtual (>= 2.0)",
                             })
-        self.addPackage("bionic", "main", "i386", "hello-bad", "2.0-1",
+        self.addPackage("bionic", "main", "amd64", "hello-bad", "2.0-1",
                         fields={"Source": "hello (= 1.0-1)",
                                 "Provides": "hello-virtual (= 1.0)"})
-        self.addPackage("bionic", "main", "i386", "hello-dependency", "1.0-1",
+        self.addPackage("bionic", "main", "amd64", "hello-dependency", "1.0-1",
                         fields={"Source": "hello",
                                 "Provides": "hello-virtual (= 2.0)"})
         branch = "ubuntu.bionic"
         self.addSeed(branch, "supported")
         self.addSeedPackage(branch, "supported", "hello")
-        germinator = Germinator("i386")
+        germinator = Germinator("amd64")
         archive = TagFile(
-            "bionic", "main", "i386", "file://%s" % self.archive_dir)
+            "bionic", "main", "amd64", "file://%s" % self.archive_dir)
         germinator.parse_archive(archive)
 
         self.assertIn("hello", germinator._sources)
@@ -403,7 +403,7 @@ class TestGerminator(TestCase):
         branch = "collection.precise"
         self.addSeed(branch, "base")
         self.addSeedSnap(branch, "base", "hello")
-        germinator = Germinator("i386")
+        germinator = Germinator("amd64")
         structure = self.openSeedStructure(branch)
         germinator.plant_seeds(structure)
         germinator.grow(structure)
@@ -417,7 +417,7 @@ class TestGerminator(TestCase):
         self.addSeed(branch, "base")
         self.addSeedSnap(branch, "base", "(hello)")
         with self.assertLogs("germinate", level=logging.WARNING) as logs:
-            germinator = Germinator("i386")
+            germinator = Germinator("amd64")
             structure = self.openSeedStructure(branch)
             germinator.plant_seeds(structure)
             germinator.grow(structure)
diff --git a/germinate/tests/test_integration.py b/germinate/tests/test_integration.py
index 83cc74e..8d60b40 100644
--- a/germinate/tests/test_integration.py
+++ b/germinate/tests/test_integration.py
@@ -45,9 +45,9 @@ class TestGerminate(TestCase):
     def test_trivial(self):
         self.addSource("warty", "main", "hello", "1.0-1",
                        ["hello", "hello-dependency"])
-        self.addPackage("warty", "main", "i386", "hello", "1.0-1",
+        self.addPackage("warty", "main", "amd64", "hello", "1.0-1",
                         fields={"Depends": "hello-dependency"})
-        self.addPackage("warty", "main", "i386", "hello-dependency", "1.0-1",
+        self.addPackage("warty", "main", "amd64", "hello-dependency", "1.0-1",
                         fields={"Source": "hello"})
         self.addSeed("ubuntu.warty", "supported")
         self.addSeedPackage("ubuntu.warty", "supported", "hello")
@@ -65,7 +65,7 @@ class TestGerminate(TestCase):
         # Need Packages
         self.addSource("warty", "main", "hello", "1.0-1",
                        ["hello", "hello-dependency"])
-        self.addPackage("warty", "main", "i386", "hello-dependency", "1.0-1",
+        self.addPackage("warty", "main", "amd64", "hello-dependency", "1.0-1",
                         fields={"Source": "hello"})
         self.addSeed("ubuntu.warty", "supported")
         self.addSeedSnap("ubuntu.warty", "supported", "mycoolsnap")
@@ -84,7 +84,7 @@ class TestGerminate(TestCase):
         # Need Packages
         self.addSource("warty", "main", "hello", "1.0-1",
                        ["hello", "hello-dependency"])
-        self.addPackage("warty", "main", "i386", "hello-dependency", "1.0-1",
+        self.addPackage("warty", "main", "amd64", "hello-dependency", "1.0-1",
                         fields={"Source": "hello"})
         self.addSeed("ubuntu.warty", "supported")
         self.addSeedSnap("ubuntu.warty", "supported", "mycoolsnap/classic")
diff --git a/man/germinate-pkg-diff.1 b/man/germinate-pkg-diff.1
index 86c29f7..4fe76d8 100644
--- a/man/germinate-pkg-diff.1
+++ b/man/germinate-pkg-diff.1
@@ -70,13 +70,13 @@ The default is
 Fetch seeds for distribution
 .Ar dist .
 The default is
-.Li ubuntu.bionic .
+.Li ubuntu.focal .
 .It Xo Fl d ,
 .Fl Fl dist Ar dist Ns \&,...
 .Xc
 Operate on the specified distributions.
 The default is
-.Li bionic .
+.Li focal .
 Listing multiple distributions may be useful, for example, when examining
 both a released distribution and its security updates.
 .It Xo Fl a ,
@@ -85,7 +85,7 @@ both a released distribution and its security updates.
 Operate on architecture
 .Ar arch .
 The default is
-.Li i386 .
+.Li amd64 .
 .El
 .Sh BUGS
 .Fl Fl mode Li r
diff --git a/man/germinate-update-metapackage.1 b/man/germinate-update-metapackage.1
index 6145362..b701db3 100644
--- a/man/germinate-update-metapackage.1
+++ b/man/germinate-update-metapackage.1
@@ -198,9 +198,9 @@ the
 source package in the Ubuntu archive:
 .Bd -literal -offset indent
 [DEFAULT]
-dist: bionic
+dist: focal
 
-[bionic]
+[focal]
 seeds: desktop full active
 architectures: i386 amd64 powerpc armhf arm64 ppc64el
 seed_base: http://people.canonical.com/~ubuntu-archive/seeds/
@@ -213,7 +213,7 @@ archive_base/arm64: %(archive_base/ports)s
 archive_base/ppc64el: %(archive_base/ports)s
 components: main restricted universe
 
-[bionic/bzr]
+[focal/bzr]
 seed_base: bzr+ssh://bazaar.launchpad.net/~kubuntu-dev/ubuntu-seeds/ bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/
 seed_dist: kubuntu.%(dist)s
 .Ed
diff --git a/man/germinate.1 b/man/germinate.1
index 4c32804..1d3ef15 100644
--- a/man/germinate.1
+++ b/man/germinate.1
@@ -241,7 +241,7 @@ then you would use the options
 Fetch seeds for distribution
 .Ar dist .
 The default is
-.Li ubuntu.bionic .
+.Li ubuntu.focal .
 .Pp
 When fetching seeds from git, the part after the rightmost
 .Sq \&.
@@ -267,7 +267,7 @@ across all archives will win.
 .Xc
 Operate on the specified distributions.
 The default is
-.Li bionic .
+.Li focal .
 Listing multiple distributions may be useful, for example, when examining
 both a released distribution and its security updates.
 .It Xo Fl a ,
@@ -276,7 +276,7 @@ both a released distribution and its security updates.
 Operate on architecture
 .Ar arch .
 The default is
-.Li i386 .
+.Li amd64 .
 .It Xo Fl c ,
 .Fl Fl components Ar component Ns \&,...
 .Xc
diff --git a/tox.ini b/tox.ini
index ec44f96..d5c3e87 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 # Note that only environments where you have a suitable version of
 # python-apt installed on the host system will work.
-envlist = py27,py33,py34,py35,py36,py37
+envlist = py27,py33,py34,py35,py36,py37,py38
 
 [testenv]
 sitepackages = true