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

Proposed by Dimitri John Ledkov
Status: Needs review
Proposed branch: ~xnox/germinate:focal-amd64-default
Merge into: germinate:master
Diff against target: 460 lines (+66/-60)
9 files modified
debian/changelog (+6/-0)
germinate/defaults.py (+3/-3)
germinate/tests/test_archive.py (+12/-12)
germinate/tests/test_germinator.py (+31/-31)
germinate/tests/test_integration.py (+4/-4)
man/germinate-pkg-diff.1 (+3/-3)
man/germinate-update-metapackage.1 (+3/-3)
man/germinate.1 (+3/-3)
tox.ini (+1/-1)
Reviewer Review Type Date Requested Status
Colin Watson Needs Fixing
Review via email: mp+374917@code.launchpad.net

Commit message

Switch defaults to focal/amd64

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

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
~xnox/germinate:focal-amd64-default updated
4fc78b2... by Dimitri John Ledkov

Update manpages

f8d96e9... by Dimitri John Ledkov

Update testsuite

cd5ad6f... by Dimitri John Ledkov

Add py38 to tox.ini

384bef5... by Dimitri John Ledkov

Changelog

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

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.

Revision history for this message
Colin Watson (cjwatson) wrote :

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?

~xnox/germinate:focal-amd64-default updated
8eb449f... by Dimitri John Ledkov

Update i386->amd64 in more places

Unmerged commits

8eb449f... by Dimitri John Ledkov

Update i386->amd64 in more places

384bef5... by Dimitri John Ledkov

Changelog

cd5ad6f... by Dimitri John Ledkov

Add py38 to tox.ini

f8d96e9... by Dimitri John Ledkov

Update testsuite

4fc78b2... by Dimitri John Ledkov

Update manpages

e28a6ec... by Dimitri John Ledkov

Change defaults to focal/amd64

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index ce2e126..0e4cdb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1germinate (2.33) UNRELEASED; urgency=medium
2
3 * Change defaults from bionic/i386 to focal/amd64.
4
5 -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 20 Nov 2019 14:56:35 +0000
6
1germinate (2.32) unstable; urgency=medium7germinate (2.32) unstable; urgency=medium
28
3 * Remove ancient X-Python-Version and X-Python3-Version fields.9 * 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 @@
22seeds = 'http://people.canonical.com/~ubuntu-archive/seeds/'22seeds = 'http://people.canonical.com/~ubuntu-archive/seeds/'
23seeds_bzr = 'http://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/'23seeds_bzr = 'http://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/'
24seeds_git = 'git://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/'24seeds_git = 'git://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/'
25release = 'ubuntu.bionic'25release = 'ubuntu.focal'
2626
27# If we need to download Packages.gz and/or Sources.gz, where do we get27# If we need to download Packages.gz and/or Sources.gz, where do we get
28# them from?28# them from?
29mirror = 'http://archive.ubuntu.com/ubuntu/'29mirror = 'http://archive.ubuntu.com/ubuntu/'
30dist = 'bionic'30dist = 'focal'
31arch = 'i386'31arch = '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):
53 """Test fetching sections from a basic TagFile archive using gzip."""53 """Test fetching sections from a basic TagFile archive using gzip."""
54 self.useTempDir()54 self.useTempDir()
55 main_dir = os.path.join("mirror", "dists", "unstable", "main")55 main_dir = os.path.join("mirror", "dists", "unstable", "main")
56 binary_dir = os.path.join(main_dir, "binary-i386")56 binary_dir = os.path.join(main_dir, "binary-amd64")
57 source_dir = os.path.join(main_dir, "source")57 source_dir = os.path.join(main_dir, "source")
58 os.makedirs(binary_dir)58 os.makedirs(binary_dir)
59 os.makedirs(source_dir)59 os.makedirs(source_dir)
@@ -62,7 +62,7 @@ class TestTagFile(TestCase):
62 packages.write(textwrap.dedent(u"""\62 packages.write(textwrap.dedent(u"""\
63 Package: test63 Package: test
64 Version: 1.064 Version: 1.0
65 Architecture: i38665 Architecture: amd64
66 Maintainer: úḃúñŧů đəvẽłõṗèŗṡ66 Maintainer: úḃúñŧů đəvẽłõṗèŗṡ
6767
68 """).encode("UTF-8"))68 """).encode("UTF-8"))
@@ -75,12 +75,12 @@ class TestTagFile(TestCase):
75 """).encode("UTF-8"))75 """).encode("UTF-8"))
7676
77 tagfile = TagFile(77 tagfile = TagFile(
78 "unstable", "main", "i386", "file://%s/mirror" % self.temp_dir)78 "unstable", "main", "amd64", "file://%s/mirror" % self.temp_dir)
79 sections = list(tagfile.sections())79 sections = list(tagfile.sections())
80 self.assertEqual(IndexType.PACKAGES, sections[0][0])80 self.assertEqual(IndexType.PACKAGES, sections[0][0])
81 self.assertEqual("test", sections[0][1]["Package"])81 self.assertEqual("test", sections[0][1]["Package"])
82 self.assertEqual("1.0", sections[0][1]["Version"])82 self.assertEqual("1.0", sections[0][1]["Version"])
83 self.assertEqual("i386", sections[0][1]["Architecture"])83 self.assertEqual("amd64", sections[0][1]["Architecture"])
84 self.assertEqual(IndexType.SOURCES, sections[1][0])84 self.assertEqual(IndexType.SOURCES, sections[1][0])
85 self.assertEqual("test", sections[1][1]["Source"])85 self.assertEqual("test", sections[1][1]["Source"])
86 self.assertEqual("1.0", sections[1][1]["Version"])86 self.assertEqual("1.0", sections[1][1]["Version"])
@@ -89,7 +89,7 @@ class TestTagFile(TestCase):
89 """Test fetching sections from a basic TagFile archive using bzip2."""89 """Test fetching sections from a basic TagFile archive using bzip2."""
90 self.useTempDir()90 self.useTempDir()
91 main_dir = os.path.join("mirror", "dists", "unstable", "main")91 main_dir = os.path.join("mirror", "dists", "unstable", "main")
92 binary_dir = os.path.join(main_dir, "binary-i386")92 binary_dir = os.path.join(main_dir, "binary-amd64")
93 source_dir = os.path.join(main_dir, "source")93 source_dir = os.path.join(main_dir, "source")
94 os.makedirs(binary_dir)94 os.makedirs(binary_dir)
95 os.makedirs(source_dir)95 os.makedirs(source_dir)
@@ -98,7 +98,7 @@ class TestTagFile(TestCase):
98 packages.write(textwrap.dedent(u"""\98 packages.write(textwrap.dedent(u"""\
99 Package: test99 Package: test
100 Version: 1.0100 Version: 1.0
101 Architecture: i386101 Architecture: amd64
102 Maintainer: úḃúñŧů đəvẽłõṗèŗṡ102 Maintainer: úḃúñŧů đəvẽłõṗèŗṡ
103103
104 """).encode("UTF-8"))104 """).encode("UTF-8"))
@@ -111,12 +111,12 @@ class TestTagFile(TestCase):
111 """).encode("UTF-8"))111 """).encode("UTF-8"))
112112
113 tagfile = TagFile(113 tagfile = TagFile(
114 "unstable", "main", "i386", "file://%s/mirror" % self.temp_dir)114 "unstable", "main", "amd64", "file://%s/mirror" % self.temp_dir)
115 sections = list(tagfile.sections())115 sections = list(tagfile.sections())
116 self.assertEqual(IndexType.PACKAGES, sections[0][0])116 self.assertEqual(IndexType.PACKAGES, sections[0][0])
117 self.assertEqual("test", sections[0][1]["Package"])117 self.assertEqual("test", sections[0][1]["Package"])
118 self.assertEqual("1.0", sections[0][1]["Version"])118 self.assertEqual("1.0", sections[0][1]["Version"])
119 self.assertEqual("i386", sections[0][1]["Architecture"])119 self.assertEqual("amd64", sections[0][1]["Architecture"])
120 self.assertEqual(IndexType.SOURCES, sections[1][0])120 self.assertEqual(IndexType.SOURCES, sections[1][0])
121 self.assertEqual("test", sections[1][1]["Source"])121 self.assertEqual("test", sections[1][1]["Source"])
122 self.assertEqual("1.0", sections[1][1]["Version"])122 self.assertEqual("1.0", sections[1][1]["Version"])
@@ -125,7 +125,7 @@ class TestTagFile(TestCase):
125 """Test fetching sections from a basic TagFile archive using xz."""125 """Test fetching sections from a basic TagFile archive using xz."""
126 self.useTempDir()126 self.useTempDir()
127 main_dir = os.path.join("mirror", "dists", "unstable", "main")127 main_dir = os.path.join("mirror", "dists", "unstable", "main")
128 binary_dir = os.path.join(main_dir, "binary-i386")128 binary_dir = os.path.join(main_dir, "binary-amd64")
129 source_dir = os.path.join(main_dir, "source")129 source_dir = os.path.join(main_dir, "source")
130 os.makedirs(binary_dir)130 os.makedirs(binary_dir)
131 os.makedirs(source_dir)131 os.makedirs(source_dir)
@@ -133,7 +133,7 @@ class TestTagFile(TestCase):
133 packages.write(textwrap.dedent(u"""\133 packages.write(textwrap.dedent(u"""\
134 Package: test134 Package: test
135 Version: 1.0135 Version: 1.0
136 Architecture: i386136 Architecture: amd64
137 Maintainer: úḃúñŧů đəvẽłõṗèŗṡ137 Maintainer: úḃúñŧů đəvẽłõṗèŗṡ
138138
139 """).encode("UTF-8"))139 """).encode("UTF-8"))
@@ -147,12 +147,12 @@ class TestTagFile(TestCase):
147 subprocess.check_call(["xz", os.path.join(source_dir, "Sources")])147 subprocess.check_call(["xz", os.path.join(source_dir, "Sources")])
148148
149 tagfile = TagFile(149 tagfile = TagFile(
150 "unstable", "main", "i386", "file://%s/mirror" % self.temp_dir)150 "unstable", "main", "amd64", "file://%s/mirror" % self.temp_dir)
151 sections = list(tagfile.sections())151 sections = list(tagfile.sections())
152 self.assertEqual(IndexType.PACKAGES, sections[0][0])152 self.assertEqual(IndexType.PACKAGES, sections[0][0])
153 self.assertEqual("test", sections[0][1]["Package"])153 self.assertEqual("test", sections[0][1]["Package"])
154 self.assertEqual("1.0", sections[0][1]["Version"])154 self.assertEqual("1.0", sections[0][1]["Version"])
155 self.assertEqual("i386", sections[0][1]["Architecture"])155 self.assertEqual("amd64", sections[0][1]["Architecture"])
156 self.assertEqual(IndexType.SOURCES, sections[1][0])156 self.assertEqual(IndexType.SOURCES, sections[1][0])
157 self.assertEqual("test", sections[1][1]["Source"])157 self.assertEqual("test", sections[1][1]["Source"])
158 self.assertEqual("1.0", sections[1][1]["Version"])158 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):
103 self.addSeedPackage(two, "desktop", "desktop")103 self.addSeedPackage(two, "desktop", "desktop")
104 structure_one = self.openSeedStructure(one)104 structure_one = self.openSeedStructure(one)
105 structure_two = self.openSeedStructure(two)105 structure_two = self.openSeedStructure(two)
106 germinator = Germinator("i386")106 germinator = Germinator("amd64")
107 desktop_one = GerminatedSeed(107 desktop_one = GerminatedSeed(
108 germinator, "desktop", structure_one, structure_one["desktop"])108 germinator, "desktop", structure_one, structure_one["desktop"])
109 desktop_two = GerminatedSeed(109 desktop_two = GerminatedSeed(
@@ -124,7 +124,7 @@ class TestGerminatedSeed(TestCase):
124 self.addSeedPackage(two, "desktop", "desktop")124 self.addSeedPackage(two, "desktop", "desktop")
125 structure_one = self.openSeedStructure(one)125 structure_one = self.openSeedStructure(one)
126 structure_two = self.openSeedStructure(two)126 structure_two = self.openSeedStructure(two)
127 germinator = Germinator("i386")127 germinator = Germinator("amd64")
128 desktop_one = GerminatedSeed(128 desktop_one = GerminatedSeed(
129 germinator, "desktop", structure_one, structure_one["desktop"])129 germinator, "desktop", structure_one, structure_one["desktop"])
130 desktop_two = GerminatedSeed(130 desktop_two = GerminatedSeed(
@@ -138,18 +138,18 @@ class TestGerminator(TestCase):
138 self.addSource("warty", "main", "hello", "1.0-1",138 self.addSource("warty", "main", "hello", "1.0-1",
139 ["hello", "hello-dependency"],139 ["hello", "hello-dependency"],
140 fields={"Maintainer": "Test Person <test@example.com>"})140 fields={"Maintainer": "Test Person <test@example.com>"})
141 self.addPackage("warty", "main", "i386", "hello", "1.0-1",141 self.addPackage("warty", "main", "amd64", "hello", "1.0-1",
142 fields={142 fields={
143 "Maintainer": "Test Person <test@example.com>",143 "Maintainer": "Test Person <test@example.com>",
144 "Depends": "hello-dependency",144 "Depends": "hello-dependency",
145 })145 })
146 self.addPackage("warty", "main", "i386", "hello-dependency", "1.0-1",146 self.addPackage("warty", "main", "amd64", "hello-dependency", "1.0-1",
147 fields={"Source": "hello", "Multi-Arch": "foreign"})147 fields={"Source": "hello", "Multi-Arch": "foreign"})
148 self.addSeed("ubuntu.warty", "supported")148 self.addSeed("ubuntu.warty", "supported")
149 self.addSeedPackage("ubuntu.warty", "supported", "hello")149 self.addSeedPackage("ubuntu.warty", "supported", "hello")
150 germinator = Germinator("i386")150 germinator = Germinator("amd64")
151 archive = TagFile(151 archive = TagFile(
152 "warty", "main", "i386", "file://%s" % self.archive_dir)152 "warty", "main", "amd64", "file://%s" % self.archive_dir)
153 germinator.parse_archive(archive)153 germinator.parse_archive(archive)
154154
155 self.assertIn("hello", germinator._sources)155 self.assertIn("hello", germinator._sources)
@@ -202,14 +202,14 @@ class TestGerminator(TestCase):
202 def test_different_providers_between_suites(self):202 def test_different_providers_between_suites(self):
203 """Provides from later versions override those from earlier ones."""203 """Provides from later versions override those from earlier ones."""
204 self.addSource("warty", "main", "hello", "1.0-1", ["hello"])204 self.addSource("warty", "main", "hello", "1.0-1", ["hello"])
205 self.addPackage("warty", "main", "i386", "hello", "1.0-1",205 self.addPackage("warty", "main", "amd64", "hello", "1.0-1",
206 fields={"Provides": "goodbye"})206 fields={"Provides": "goodbye"})
207 self.addSource("warty-updates", "main", "hello", "1.0-1.1", ["hello"])207 self.addSource("warty-updates", "main", "hello", "1.0-1.1", ["hello"])
208 self.addPackage("warty-updates", "main", "i386", "hello", "1.0-1.1",208 self.addPackage("warty-updates", "main", "amd64", "hello", "1.0-1.1",
209 fields={"Provides": "hello-goodbye"})209 fields={"Provides": "hello-goodbye"})
210 germinator = Germinator("i386")210 germinator = Germinator("amd64")
211 archive = TagFile(211 archive = TagFile(
212 ["warty", "warty-updates"], "main", "i386",212 ["warty", "warty-updates"], "main", "amd64",
213 "file://%s" % self.archive_dir)213 "file://%s" % self.archive_dir)
214 germinator.parse_archive(archive)214 germinator.parse_archive(archive)
215215
@@ -237,21 +237,21 @@ class TestGerminator(TestCase):
237 ("allowed", ":native", False),237 ("allowed", ":native", False),
238 ):238 ):
239 self.addSource("precise", "main", "hello", "1.0-1", ["hello"])239 self.addSource("precise", "main", "hello", "1.0-1", ["hello"])
240 self.addPackage("precise", "main", "i386", "hello", "1.0-1",240 self.addPackage("precise", "main", "amd64", "hello", "1.0-1",
241 fields={"Depends": "gettext%s" % qual})241 fields={"Depends": "gettext%s" % qual})
242 self.addSource("precise", "main", "gettext", "0.18.1.1-5ubuntu3",242 self.addSource("precise", "main", "gettext", "0.18.1.1-5ubuntu3",
243 ["gettext"])243 ["gettext"])
244 package_fields = {}244 package_fields = {}
245 if ma is not None:245 if ma is not None:
246 package_fields["Multi-Arch"] = ma246 package_fields["Multi-Arch"] = ma
247 self.addPackage("precise", "main", "i386", "gettext",247 self.addPackage("precise", "main", "amd64", "gettext",
248 "0.18.1.1-5ubuntu3", fields=package_fields)248 "0.18.1.1-5ubuntu3", fields=package_fields)
249 branch = "collection.precise"249 branch = "collection.precise"
250 self.addSeed(branch, "base")250 self.addSeed(branch, "base")
251 self.addSeedPackage(branch, "base", "hello")251 self.addSeedPackage(branch, "base", "hello")
252 germinator = Germinator("i386")252 germinator = Germinator("amd64")
253 archive = TagFile(253 archive = TagFile(
254 "precise", "main", "i386", "file://%s" % self.archive_dir)254 "precise", "main", "amd64", "file://%s" % self.archive_dir)
255 germinator.parse_archive(archive)255 germinator.parse_archive(archive)
256 structure = self.openSeedStructure(branch)256 structure = self.openSeedStructure(branch)
257 germinator.plant_seeds(structure)257 germinator.plant_seeds(structure)
@@ -290,20 +290,20 @@ class TestGerminator(TestCase):
290 ):290 ):
291 self.addSource("precise", "main", "hello", "1.0-1", ["hello"],291 self.addSource("precise", "main", "hello", "1.0-1", ["hello"],
292 fields={"Build-Depends": "gettext%s" % qual})292 fields={"Build-Depends": "gettext%s" % qual})
293 self.addPackage("precise", "main", "i386", "hello", "1.0-1")293 self.addPackage("precise", "main", "amd64", "hello", "1.0-1")
294 self.addSource("precise", "main", "gettext", "0.18.1.1-5ubuntu3",294 self.addSource("precise", "main", "gettext", "0.18.1.1-5ubuntu3",
295 ["gettext"])295 ["gettext"])
296 package_fields = {}296 package_fields = {}
297 if ma is not None:297 if ma is not None:
298 package_fields["Multi-Arch"] = ma298 package_fields["Multi-Arch"] = ma
299 self.addPackage("precise", "main", "i386", "gettext",299 self.addPackage("precise", "main", "amd64", "gettext",
300 "0.18.1.1-5ubuntu3", fields=package_fields)300 "0.18.1.1-5ubuntu3", fields=package_fields)
301 branch = "collection.precise"301 branch = "collection.precise"
302 self.addSeed(branch, "base")302 self.addSeed(branch, "base")
303 self.addSeedPackage(branch, "base", "hello")303 self.addSeedPackage(branch, "base", "hello")
304 germinator = Germinator("i386")304 germinator = Germinator("amd64")
305 archive = TagFile(305 archive = TagFile(
306 "precise", "main", "i386", "file://%s" % self.archive_dir)306 "precise", "main", "amd64", "file://%s" % self.archive_dir)
307 germinator.parse_archive(archive)307 germinator.parse_archive(archive)
308 structure = self.openSeedStructure(branch)308 structure = self.openSeedStructure(branch)
309 germinator.plant_seeds(structure)309 germinator.plant_seeds(structure)
@@ -330,24 +330,24 @@ class TestGerminator(TestCase):
330 "gettext <!stage1> <!cross>, "330 "gettext <!stage1> <!cross>, "
331 "base-files <stage1>, "331 "base-files <stage1>, "
332 "gettext (<< 0.7) | debhelper (>= 9)"})332 "gettext (<< 0.7) | debhelper (>= 9)"})
333 self.addPackage("precise", "main", "i386", "hello", "1.0-1")333 self.addPackage("precise", "main", "amd64", "hello", "1.0-1")
334 self.addSource("precise", "main", "gettext", "0.8.1.1-5ubuntu3",334 self.addSource("precise", "main", "gettext", "0.8.1.1-5ubuntu3",
335 ["gettext"])335 ["gettext"])
336 self.addPackage("precise", "main", "i386", "gettext",336 self.addPackage("precise", "main", "amd64", "gettext",
337 "0.8.1.1-5ubuntu3")337 "0.8.1.1-5ubuntu3")
338 self.addSource("precise", "main", "base-files", "6.5ubuntu6",338 self.addSource("precise", "main", "base-files", "6.5ubuntu6",
339 ["base-files"])339 ["base-files"])
340 self.addPackage("precise", "main", "i386", "base-files", "6.5ubuntu6")340 self.addPackage("precise", "main", "amd64", "base-files", "6.5ubuntu6")
341 self.addSource("precise", "main", "debhelper", "9.20120115ubuntu3",341 self.addSource("precise", "main", "debhelper", "9.20120115ubuntu3",
342 ["debhelper"])342 ["debhelper"])
343 self.addPackage("precise", "main", "i386", "debhelper",343 self.addPackage("precise", "main", "amd64", "debhelper",
344 "9.20120115ubuntu3")344 "9.20120115ubuntu3")
345 branch = "collection.precise"345 branch = "collection.precise"
346 self.addSeed(branch, "base")346 self.addSeed(branch, "base")
347 self.addSeedPackage(branch, "base", "hello")347 self.addSeedPackage(branch, "base", "hello")
348 germinator = Germinator("i386")348 germinator = Germinator("amd64")
349 archive = TagFile(349 archive = TagFile(
350 "precise", "main", "i386", "file://%s" % self.archive_dir)350 "precise", "main", "amd64", "file://%s" % self.archive_dir)
351 germinator.parse_archive(archive)351 germinator.parse_archive(archive)
352 structure = self.openSeedStructure(branch)352 structure = self.openSeedStructure(branch)
353 germinator.plant_seeds(structure)353 germinator.plant_seeds(structure)
@@ -362,23 +362,23 @@ class TestGerminator(TestCase):
362 self.addSource("bionic", "main", "hello", "1.0-1",362 self.addSource("bionic", "main", "hello", "1.0-1",
363 ["hello", "hello-dependency", "hello-bad"],363 ["hello", "hello-dependency", "hello-bad"],
364 fields={"Maintainer": "Test Person <test@example.com>"})364 fields={"Maintainer": "Test Person <test@example.com>"})
365 self.addPackage("bionic", "main", "i386", "hello", "1.0-1",365 self.addPackage("bionic", "main", "amd64", "hello", "1.0-1",
366 fields={366 fields={
367 "Maintainer": "Test Person <test@example.com>",367 "Maintainer": "Test Person <test@example.com>",
368 "Depends": "hello-virtual (>= 2.0)",368 "Depends": "hello-virtual (>= 2.0)",
369 })369 })
370 self.addPackage("bionic", "main", "i386", "hello-bad", "2.0-1",370 self.addPackage("bionic", "main", "amd64", "hello-bad", "2.0-1",
371 fields={"Source": "hello (= 1.0-1)",371 fields={"Source": "hello (= 1.0-1)",
372 "Provides": "hello-virtual (= 1.0)"})372 "Provides": "hello-virtual (= 1.0)"})
373 self.addPackage("bionic", "main", "i386", "hello-dependency", "1.0-1",373 self.addPackage("bionic", "main", "amd64", "hello-dependency", "1.0-1",
374 fields={"Source": "hello",374 fields={"Source": "hello",
375 "Provides": "hello-virtual (= 2.0)"})375 "Provides": "hello-virtual (= 2.0)"})
376 branch = "ubuntu.bionic"376 branch = "ubuntu.bionic"
377 self.addSeed(branch, "supported")377 self.addSeed(branch, "supported")
378 self.addSeedPackage(branch, "supported", "hello")378 self.addSeedPackage(branch, "supported", "hello")
379 germinator = Germinator("i386")379 germinator = Germinator("amd64")
380 archive = TagFile(380 archive = TagFile(
381 "bionic", "main", "i386", "file://%s" % self.archive_dir)381 "bionic", "main", "amd64", "file://%s" % self.archive_dir)
382 germinator.parse_archive(archive)382 germinator.parse_archive(archive)
383383
384 self.assertIn("hello", germinator._sources)384 self.assertIn("hello", germinator._sources)
@@ -403,7 +403,7 @@ class TestGerminator(TestCase):
403 branch = "collection.precise"403 branch = "collection.precise"
404 self.addSeed(branch, "base")404 self.addSeed(branch, "base")
405 self.addSeedSnap(branch, "base", "hello")405 self.addSeedSnap(branch, "base", "hello")
406 germinator = Germinator("i386")406 germinator = Germinator("amd64")
407 structure = self.openSeedStructure(branch)407 structure = self.openSeedStructure(branch)
408 germinator.plant_seeds(structure)408 germinator.plant_seeds(structure)
409 germinator.grow(structure)409 germinator.grow(structure)
@@ -417,7 +417,7 @@ class TestGerminator(TestCase):
417 self.addSeed(branch, "base")417 self.addSeed(branch, "base")
418 self.addSeedSnap(branch, "base", "(hello)")418 self.addSeedSnap(branch, "base", "(hello)")
419 with self.assertLogs("germinate", level=logging.WARNING) as logs:419 with self.assertLogs("germinate", level=logging.WARNING) as logs:
420 germinator = Germinator("i386")420 germinator = Germinator("amd64")
421 structure = self.openSeedStructure(branch)421 structure = self.openSeedStructure(branch)
422 germinator.plant_seeds(structure)422 germinator.plant_seeds(structure)
423 germinator.grow(structure)423 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):
45 def test_trivial(self):45 def test_trivial(self):
46 self.addSource("warty", "main", "hello", "1.0-1",46 self.addSource("warty", "main", "hello", "1.0-1",
47 ["hello", "hello-dependency"])47 ["hello", "hello-dependency"])
48 self.addPackage("warty", "main", "i386", "hello", "1.0-1",48 self.addPackage("warty", "main", "amd64", "hello", "1.0-1",
49 fields={"Depends": "hello-dependency"})49 fields={"Depends": "hello-dependency"})
50 self.addPackage("warty", "main", "i386", "hello-dependency", "1.0-1",50 self.addPackage("warty", "main", "amd64", "hello-dependency", "1.0-1",
51 fields={"Source": "hello"})51 fields={"Source": "hello"})
52 self.addSeed("ubuntu.warty", "supported")52 self.addSeed("ubuntu.warty", "supported")
53 self.addSeedPackage("ubuntu.warty", "supported", "hello")53 self.addSeedPackage("ubuntu.warty", "supported", "hello")
@@ -65,7 +65,7 @@ class TestGerminate(TestCase):
65 # Need Packages65 # Need Packages
66 self.addSource("warty", "main", "hello", "1.0-1",66 self.addSource("warty", "main", "hello", "1.0-1",
67 ["hello", "hello-dependency"])67 ["hello", "hello-dependency"])
68 self.addPackage("warty", "main", "i386", "hello-dependency", "1.0-1",68 self.addPackage("warty", "main", "amd64", "hello-dependency", "1.0-1",
69 fields={"Source": "hello"})69 fields={"Source": "hello"})
70 self.addSeed("ubuntu.warty", "supported")70 self.addSeed("ubuntu.warty", "supported")
71 self.addSeedSnap("ubuntu.warty", "supported", "mycoolsnap")71 self.addSeedSnap("ubuntu.warty", "supported", "mycoolsnap")
@@ -84,7 +84,7 @@ class TestGerminate(TestCase):
84 # Need Packages84 # Need Packages
85 self.addSource("warty", "main", "hello", "1.0-1",85 self.addSource("warty", "main", "hello", "1.0-1",
86 ["hello", "hello-dependency"])86 ["hello", "hello-dependency"])
87 self.addPackage("warty", "main", "i386", "hello-dependency", "1.0-1",87 self.addPackage("warty", "main", "amd64", "hello-dependency", "1.0-1",
88 fields={"Source": "hello"})88 fields={"Source": "hello"})
89 self.addSeed("ubuntu.warty", "supported")89 self.addSeed("ubuntu.warty", "supported")
90 self.addSeedSnap("ubuntu.warty", "supported", "mycoolsnap/classic")90 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
70Fetch seeds for distribution70Fetch seeds for distribution
71.Ar dist .71.Ar dist .
72The default is72The default is
73.Li ubuntu.bionic .73.Li ubuntu.focal .
74.It Xo Fl d ,74.It Xo Fl d ,
75.Fl Fl dist Ar dist Ns \&,...75.Fl Fl dist Ar dist Ns \&,...
76.Xc76.Xc
77Operate on the specified distributions.77Operate on the specified distributions.
78The default is78The default is
79.Li bionic .79.Li focal .
80Listing multiple distributions may be useful, for example, when examining80Listing multiple distributions may be useful, for example, when examining
81both a released distribution and its security updates.81both a released distribution and its security updates.
82.It Xo Fl a ,82.It Xo Fl a ,
@@ -85,7 +85,7 @@ both a released distribution and its security updates.
85Operate on architecture85Operate on architecture
86.Ar arch .86.Ar arch .
87The default is87The default is
88.Li i386 .88.Li amd64 .
89.El89.El
90.Sh BUGS90.Sh BUGS
91.Fl Fl mode Li r91.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
198source package in the Ubuntu archive:198source package in the Ubuntu archive:
199.Bd -literal -offset indent199.Bd -literal -offset indent
200[DEFAULT]200[DEFAULT]
201dist: bionic201dist: focal
202202
203[bionic]203[focal]
204seeds: desktop full active204seeds: desktop full active
205architectures: i386 amd64 powerpc armhf arm64 ppc64el205architectures: i386 amd64 powerpc armhf arm64 ppc64el
206seed_base: http://people.canonical.com/~ubuntu-archive/seeds/206seed_base: http://people.canonical.com/~ubuntu-archive/seeds/
@@ -213,7 +213,7 @@ archive_base/arm64: %(archive_base/ports)s
213archive_base/ppc64el: %(archive_base/ports)s213archive_base/ppc64el: %(archive_base/ports)s
214components: main restricted universe214components: main restricted universe
215215
216[bionic/bzr]216[focal/bzr]
217seed_base: bzr+ssh://bazaar.launchpad.net/~kubuntu-dev/ubuntu-seeds/ bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/217seed_base: bzr+ssh://bazaar.launchpad.net/~kubuntu-dev/ubuntu-seeds/ bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/
218seed_dist: kubuntu.%(dist)s218seed_dist: kubuntu.%(dist)s
219.Ed219.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
241Fetch seeds for distribution241Fetch seeds for distribution
242.Ar dist .242.Ar dist .
243The default is243The default is
244.Li ubuntu.bionic .244.Li ubuntu.focal .
245.Pp245.Pp
246When fetching seeds from git, the part after the rightmost246When fetching seeds from git, the part after the rightmost
247.Sq \&.247.Sq \&.
@@ -267,7 +267,7 @@ across all archives will win.
267.Xc267.Xc
268Operate on the specified distributions.268Operate on the specified distributions.
269The default is269The default is
270.Li bionic .270.Li focal .
271Listing multiple distributions may be useful, for example, when examining271Listing multiple distributions may be useful, for example, when examining
272both a released distribution and its security updates.272both a released distribution and its security updates.
273.It Xo Fl a ,273.It Xo Fl a ,
@@ -276,7 +276,7 @@ both a released distribution and its security updates.
276Operate on architecture276Operate on architecture
277.Ar arch .277.Ar arch .
278The default is278The default is
279.Li i386 .279.Li amd64 .
280.It Xo Fl c ,280.It Xo Fl c ,
281.Fl Fl components Ar component Ns \&,...281.Fl Fl components Ar component Ns \&,...
282.Xc282.Xc
diff --git a/tox.ini b/tox.ini
index ec44f96..d5c3e87 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
1[tox]1[tox]
2# Note that only environments where you have a suitable version of2# Note that only environments where you have a suitable version of
3# python-apt installed on the host system will work.3# python-apt installed on the host system will work.
4envlist = py27,py33,py34,py35,py36,py374envlist = py27,py33,py34,py35,py36,py37,py38
55
6[testenv]6[testenv]
7sitepackages = true7sitepackages = true

Subscribers

People subscribed via source and target branches