Merge ~xnox/germinate:focal-amd64-default into germinate:master
- Git
- lp:~xnox/germinate
- focal-amd64-default
- Merge into master
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) |
Related bugs: |
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.
- 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
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.
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?
- 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
1 | diff --git a/debian/changelog b/debian/changelog | |||
2 | index ce2e126..0e4cdb2 100644 | |||
3 | --- a/debian/changelog | |||
4 | +++ b/debian/changelog | |||
5 | @@ -1,3 +1,9 @@ | |||
6 | 1 | germinate (2.33) UNRELEASED; urgency=medium | ||
7 | 2 | |||
8 | 3 | * Change defaults from bionic/i386 to focal/amd64. | ||
9 | 4 | |||
10 | 5 | -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 20 Nov 2019 14:56:35 +0000 | ||
11 | 6 | |||
12 | 1 | germinate (2.32) unstable; urgency=medium | 7 | germinate (2.32) unstable; urgency=medium |
13 | 2 | 8 | ||
14 | 3 | * Remove ancient X-Python-Version and X-Python3-Version fields. | 9 | * Remove ancient X-Python-Version and X-Python3-Version fields. |
15 | diff --git a/germinate/defaults.py b/germinate/defaults.py | |||
16 | index d7d15fc..2d88f9a 100644 | |||
17 | --- a/germinate/defaults.py | |||
18 | +++ b/germinate/defaults.py | |||
19 | @@ -22,10 +22,10 @@ | |||
20 | 22 | seeds = 'http://people.canonical.com/~ubuntu-archive/seeds/' | 22 | seeds = 'http://people.canonical.com/~ubuntu-archive/seeds/' |
21 | 23 | seeds_bzr = 'http://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/' | 23 | seeds_bzr = 'http://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/' |
22 | 24 | seeds_git = 'git://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/' | 24 | seeds_git = 'git://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/' |
24 | 25 | release = 'ubuntu.bionic' | 25 | release = 'ubuntu.focal' |
25 | 26 | 26 | ||
26 | 27 | # If we need to download Packages.gz and/or Sources.gz, where do we get | 27 | # If we need to download Packages.gz and/or Sources.gz, where do we get |
27 | 28 | # them from? | 28 | # them from? |
28 | 29 | mirror = 'http://archive.ubuntu.com/ubuntu/' | 29 | mirror = 'http://archive.ubuntu.com/ubuntu/' |
31 | 30 | dist = 'bionic' | 30 | dist = 'focal' |
32 | 31 | arch = 'i386' | 31 | arch = 'amd64' |
33 | diff --git a/germinate/tests/test_archive.py b/germinate/tests/test_archive.py | |||
34 | index 6e1d70e..803cd05 100644 | |||
35 | --- a/germinate/tests/test_archive.py | |||
36 | +++ b/germinate/tests/test_archive.py | |||
37 | @@ -53,7 +53,7 @@ class TestTagFile(TestCase): | |||
38 | 53 | """Test fetching sections from a basic TagFile archive using gzip.""" | 53 | """Test fetching sections from a basic TagFile archive using gzip.""" |
39 | 54 | self.useTempDir() | 54 | self.useTempDir() |
40 | 55 | main_dir = os.path.join("mirror", "dists", "unstable", "main") | 55 | main_dir = os.path.join("mirror", "dists", "unstable", "main") |
42 | 56 | binary_dir = os.path.join(main_dir, "binary-i386") | 56 | binary_dir = os.path.join(main_dir, "binary-amd64") |
43 | 57 | source_dir = os.path.join(main_dir, "source") | 57 | source_dir = os.path.join(main_dir, "source") |
44 | 58 | os.makedirs(binary_dir) | 58 | os.makedirs(binary_dir) |
45 | 59 | os.makedirs(source_dir) | 59 | os.makedirs(source_dir) |
46 | @@ -62,7 +62,7 @@ class TestTagFile(TestCase): | |||
47 | 62 | packages.write(textwrap.dedent(u"""\ | 62 | packages.write(textwrap.dedent(u"""\ |
48 | 63 | Package: test | 63 | Package: test |
49 | 64 | Version: 1.0 | 64 | Version: 1.0 |
51 | 65 | Architecture: i386 | 65 | Architecture: amd64 |
52 | 66 | Maintainer: úḃúñŧů đəvẽłõṗèŗṡ | 66 | Maintainer: úḃúñŧů đəvẽłõṗèŗṡ |
53 | 67 | 67 | ||
54 | 68 | """).encode("UTF-8")) | 68 | """).encode("UTF-8")) |
55 | @@ -75,12 +75,12 @@ class TestTagFile(TestCase): | |||
56 | 75 | """).encode("UTF-8")) | 75 | """).encode("UTF-8")) |
57 | 76 | 76 | ||
58 | 77 | tagfile = TagFile( | 77 | tagfile = TagFile( |
60 | 78 | "unstable", "main", "i386", "file://%s/mirror" % self.temp_dir) | 78 | "unstable", "main", "amd64", "file://%s/mirror" % self.temp_dir) |
61 | 79 | sections = list(tagfile.sections()) | 79 | sections = list(tagfile.sections()) |
62 | 80 | self.assertEqual(IndexType.PACKAGES, sections[0][0]) | 80 | self.assertEqual(IndexType.PACKAGES, sections[0][0]) |
63 | 81 | self.assertEqual("test", sections[0][1]["Package"]) | 81 | self.assertEqual("test", sections[0][1]["Package"]) |
64 | 82 | self.assertEqual("1.0", sections[0][1]["Version"]) | 82 | self.assertEqual("1.0", sections[0][1]["Version"]) |
66 | 83 | self.assertEqual("i386", sections[0][1]["Architecture"]) | 83 | self.assertEqual("amd64", sections[0][1]["Architecture"]) |
67 | 84 | self.assertEqual(IndexType.SOURCES, sections[1][0]) | 84 | self.assertEqual(IndexType.SOURCES, sections[1][0]) |
68 | 85 | self.assertEqual("test", sections[1][1]["Source"]) | 85 | self.assertEqual("test", sections[1][1]["Source"]) |
69 | 86 | self.assertEqual("1.0", sections[1][1]["Version"]) | 86 | self.assertEqual("1.0", sections[1][1]["Version"]) |
70 | @@ -89,7 +89,7 @@ class TestTagFile(TestCase): | |||
71 | 89 | """Test fetching sections from a basic TagFile archive using bzip2.""" | 89 | """Test fetching sections from a basic TagFile archive using bzip2.""" |
72 | 90 | self.useTempDir() | 90 | self.useTempDir() |
73 | 91 | main_dir = os.path.join("mirror", "dists", "unstable", "main") | 91 | main_dir = os.path.join("mirror", "dists", "unstable", "main") |
75 | 92 | binary_dir = os.path.join(main_dir, "binary-i386") | 92 | binary_dir = os.path.join(main_dir, "binary-amd64") |
76 | 93 | source_dir = os.path.join(main_dir, "source") | 93 | source_dir = os.path.join(main_dir, "source") |
77 | 94 | os.makedirs(binary_dir) | 94 | os.makedirs(binary_dir) |
78 | 95 | os.makedirs(source_dir) | 95 | os.makedirs(source_dir) |
79 | @@ -98,7 +98,7 @@ class TestTagFile(TestCase): | |||
80 | 98 | packages.write(textwrap.dedent(u"""\ | 98 | packages.write(textwrap.dedent(u"""\ |
81 | 99 | Package: test | 99 | Package: test |
82 | 100 | Version: 1.0 | 100 | Version: 1.0 |
84 | 101 | Architecture: i386 | 101 | Architecture: amd64 |
85 | 102 | Maintainer: úḃúñŧů đəvẽłõṗèŗṡ | 102 | Maintainer: úḃúñŧů đəvẽłõṗèŗṡ |
86 | 103 | 103 | ||
87 | 104 | """).encode("UTF-8")) | 104 | """).encode("UTF-8")) |
88 | @@ -111,12 +111,12 @@ class TestTagFile(TestCase): | |||
89 | 111 | """).encode("UTF-8")) | 111 | """).encode("UTF-8")) |
90 | 112 | 112 | ||
91 | 113 | tagfile = TagFile( | 113 | tagfile = TagFile( |
93 | 114 | "unstable", "main", "i386", "file://%s/mirror" % self.temp_dir) | 114 | "unstable", "main", "amd64", "file://%s/mirror" % self.temp_dir) |
94 | 115 | sections = list(tagfile.sections()) | 115 | sections = list(tagfile.sections()) |
95 | 116 | self.assertEqual(IndexType.PACKAGES, sections[0][0]) | 116 | self.assertEqual(IndexType.PACKAGES, sections[0][0]) |
96 | 117 | self.assertEqual("test", sections[0][1]["Package"]) | 117 | self.assertEqual("test", sections[0][1]["Package"]) |
97 | 118 | self.assertEqual("1.0", sections[0][1]["Version"]) | 118 | self.assertEqual("1.0", sections[0][1]["Version"]) |
99 | 119 | self.assertEqual("i386", sections[0][1]["Architecture"]) | 119 | self.assertEqual("amd64", sections[0][1]["Architecture"]) |
100 | 120 | self.assertEqual(IndexType.SOURCES, sections[1][0]) | 120 | self.assertEqual(IndexType.SOURCES, sections[1][0]) |
101 | 121 | self.assertEqual("test", sections[1][1]["Source"]) | 121 | self.assertEqual("test", sections[1][1]["Source"]) |
102 | 122 | self.assertEqual("1.0", sections[1][1]["Version"]) | 122 | self.assertEqual("1.0", sections[1][1]["Version"]) |
103 | @@ -125,7 +125,7 @@ class TestTagFile(TestCase): | |||
104 | 125 | """Test fetching sections from a basic TagFile archive using xz.""" | 125 | """Test fetching sections from a basic TagFile archive using xz.""" |
105 | 126 | self.useTempDir() | 126 | self.useTempDir() |
106 | 127 | main_dir = os.path.join("mirror", "dists", "unstable", "main") | 127 | main_dir = os.path.join("mirror", "dists", "unstable", "main") |
108 | 128 | binary_dir = os.path.join(main_dir, "binary-i386") | 128 | binary_dir = os.path.join(main_dir, "binary-amd64") |
109 | 129 | source_dir = os.path.join(main_dir, "source") | 129 | source_dir = os.path.join(main_dir, "source") |
110 | 130 | os.makedirs(binary_dir) | 130 | os.makedirs(binary_dir) |
111 | 131 | os.makedirs(source_dir) | 131 | os.makedirs(source_dir) |
112 | @@ -133,7 +133,7 @@ class TestTagFile(TestCase): | |||
113 | 133 | packages.write(textwrap.dedent(u"""\ | 133 | packages.write(textwrap.dedent(u"""\ |
114 | 134 | Package: test | 134 | Package: test |
115 | 135 | Version: 1.0 | 135 | Version: 1.0 |
117 | 136 | Architecture: i386 | 136 | Architecture: amd64 |
118 | 137 | Maintainer: úḃúñŧů đəvẽłõṗèŗṡ | 137 | Maintainer: úḃúñŧů đəvẽłõṗèŗṡ |
119 | 138 | 138 | ||
120 | 139 | """).encode("UTF-8")) | 139 | """).encode("UTF-8")) |
121 | @@ -147,12 +147,12 @@ class TestTagFile(TestCase): | |||
122 | 147 | subprocess.check_call(["xz", os.path.join(source_dir, "Sources")]) | 147 | subprocess.check_call(["xz", os.path.join(source_dir, "Sources")]) |
123 | 148 | 148 | ||
124 | 149 | tagfile = TagFile( | 149 | tagfile = TagFile( |
126 | 150 | "unstable", "main", "i386", "file://%s/mirror" % self.temp_dir) | 150 | "unstable", "main", "amd64", "file://%s/mirror" % self.temp_dir) |
127 | 151 | sections = list(tagfile.sections()) | 151 | sections = list(tagfile.sections()) |
128 | 152 | self.assertEqual(IndexType.PACKAGES, sections[0][0]) | 152 | self.assertEqual(IndexType.PACKAGES, sections[0][0]) |
129 | 153 | self.assertEqual("test", sections[0][1]["Package"]) | 153 | self.assertEqual("test", sections[0][1]["Package"]) |
130 | 154 | self.assertEqual("1.0", sections[0][1]["Version"]) | 154 | self.assertEqual("1.0", sections[0][1]["Version"]) |
132 | 155 | self.assertEqual("i386", sections[0][1]["Architecture"]) | 155 | self.assertEqual("amd64", sections[0][1]["Architecture"]) |
133 | 156 | self.assertEqual(IndexType.SOURCES, sections[1][0]) | 156 | self.assertEqual(IndexType.SOURCES, sections[1][0]) |
134 | 157 | self.assertEqual("test", sections[1][1]["Source"]) | 157 | self.assertEqual("test", sections[1][1]["Source"]) |
135 | 158 | self.assertEqual("1.0", sections[1][1]["Version"]) | 158 | self.assertEqual("1.0", sections[1][1]["Version"]) |
136 | diff --git a/germinate/tests/test_germinator.py b/germinate/tests/test_germinator.py | |||
137 | index 5b84c63..d585fe4 100644 | |||
138 | --- a/germinate/tests/test_germinator.py | |||
139 | +++ b/germinate/tests/test_germinator.py | |||
140 | @@ -103,7 +103,7 @@ class TestGerminatedSeed(TestCase): | |||
141 | 103 | self.addSeedPackage(two, "desktop", "desktop") | 103 | self.addSeedPackage(two, "desktop", "desktop") |
142 | 104 | structure_one = self.openSeedStructure(one) | 104 | structure_one = self.openSeedStructure(one) |
143 | 105 | structure_two = self.openSeedStructure(two) | 105 | structure_two = self.openSeedStructure(two) |
145 | 106 | germinator = Germinator("i386") | 106 | germinator = Germinator("amd64") |
146 | 107 | desktop_one = GerminatedSeed( | 107 | desktop_one = GerminatedSeed( |
147 | 108 | germinator, "desktop", structure_one, structure_one["desktop"]) | 108 | germinator, "desktop", structure_one, structure_one["desktop"]) |
148 | 109 | desktop_two = GerminatedSeed( | 109 | desktop_two = GerminatedSeed( |
149 | @@ -124,7 +124,7 @@ class TestGerminatedSeed(TestCase): | |||
150 | 124 | self.addSeedPackage(two, "desktop", "desktop") | 124 | self.addSeedPackage(two, "desktop", "desktop") |
151 | 125 | structure_one = self.openSeedStructure(one) | 125 | structure_one = self.openSeedStructure(one) |
152 | 126 | structure_two = self.openSeedStructure(two) | 126 | structure_two = self.openSeedStructure(two) |
154 | 127 | germinator = Germinator("i386") | 127 | germinator = Germinator("amd64") |
155 | 128 | desktop_one = GerminatedSeed( | 128 | desktop_one = GerminatedSeed( |
156 | 129 | germinator, "desktop", structure_one, structure_one["desktop"]) | 129 | germinator, "desktop", structure_one, structure_one["desktop"]) |
157 | 130 | desktop_two = GerminatedSeed( | 130 | desktop_two = GerminatedSeed( |
158 | @@ -138,18 +138,18 @@ class TestGerminator(TestCase): | |||
159 | 138 | self.addSource("warty", "main", "hello", "1.0-1", | 138 | self.addSource("warty", "main", "hello", "1.0-1", |
160 | 139 | ["hello", "hello-dependency"], | 139 | ["hello", "hello-dependency"], |
161 | 140 | fields={"Maintainer": "Test Person <test@example.com>"}) | 140 | fields={"Maintainer": "Test Person <test@example.com>"}) |
163 | 141 | self.addPackage("warty", "main", "i386", "hello", "1.0-1", | 141 | self.addPackage("warty", "main", "amd64", "hello", "1.0-1", |
164 | 142 | fields={ | 142 | fields={ |
165 | 143 | "Maintainer": "Test Person <test@example.com>", | 143 | "Maintainer": "Test Person <test@example.com>", |
166 | 144 | "Depends": "hello-dependency", | 144 | "Depends": "hello-dependency", |
167 | 145 | }) | 145 | }) |
169 | 146 | self.addPackage("warty", "main", "i386", "hello-dependency", "1.0-1", | 146 | self.addPackage("warty", "main", "amd64", "hello-dependency", "1.0-1", |
170 | 147 | fields={"Source": "hello", "Multi-Arch": "foreign"}) | 147 | fields={"Source": "hello", "Multi-Arch": "foreign"}) |
171 | 148 | self.addSeed("ubuntu.warty", "supported") | 148 | self.addSeed("ubuntu.warty", "supported") |
172 | 149 | self.addSeedPackage("ubuntu.warty", "supported", "hello") | 149 | self.addSeedPackage("ubuntu.warty", "supported", "hello") |
174 | 150 | germinator = Germinator("i386") | 150 | germinator = Germinator("amd64") |
175 | 151 | archive = TagFile( | 151 | archive = TagFile( |
177 | 152 | "warty", "main", "i386", "file://%s" % self.archive_dir) | 152 | "warty", "main", "amd64", "file://%s" % self.archive_dir) |
178 | 153 | germinator.parse_archive(archive) | 153 | germinator.parse_archive(archive) |
179 | 154 | 154 | ||
180 | 155 | self.assertIn("hello", germinator._sources) | 155 | self.assertIn("hello", germinator._sources) |
181 | @@ -202,14 +202,14 @@ class TestGerminator(TestCase): | |||
182 | 202 | def test_different_providers_between_suites(self): | 202 | def test_different_providers_between_suites(self): |
183 | 203 | """Provides from later versions override those from earlier ones.""" | 203 | """Provides from later versions override those from earlier ones.""" |
184 | 204 | self.addSource("warty", "main", "hello", "1.0-1", ["hello"]) | 204 | self.addSource("warty", "main", "hello", "1.0-1", ["hello"]) |
186 | 205 | self.addPackage("warty", "main", "i386", "hello", "1.0-1", | 205 | self.addPackage("warty", "main", "amd64", "hello", "1.0-1", |
187 | 206 | fields={"Provides": "goodbye"}) | 206 | fields={"Provides": "goodbye"}) |
188 | 207 | self.addSource("warty-updates", "main", "hello", "1.0-1.1", ["hello"]) | 207 | self.addSource("warty-updates", "main", "hello", "1.0-1.1", ["hello"]) |
190 | 208 | self.addPackage("warty-updates", "main", "i386", "hello", "1.0-1.1", | 208 | self.addPackage("warty-updates", "main", "amd64", "hello", "1.0-1.1", |
191 | 209 | fields={"Provides": "hello-goodbye"}) | 209 | fields={"Provides": "hello-goodbye"}) |
193 | 210 | germinator = Germinator("i386") | 210 | germinator = Germinator("amd64") |
194 | 211 | archive = TagFile( | 211 | archive = TagFile( |
196 | 212 | ["warty", "warty-updates"], "main", "i386", | 212 | ["warty", "warty-updates"], "main", "amd64", |
197 | 213 | "file://%s" % self.archive_dir) | 213 | "file://%s" % self.archive_dir) |
198 | 214 | germinator.parse_archive(archive) | 214 | germinator.parse_archive(archive) |
199 | 215 | 215 | ||
200 | @@ -237,21 +237,21 @@ class TestGerminator(TestCase): | |||
201 | 237 | ("allowed", ":native", False), | 237 | ("allowed", ":native", False), |
202 | 238 | ): | 238 | ): |
203 | 239 | self.addSource("precise", "main", "hello", "1.0-1", ["hello"]) | 239 | self.addSource("precise", "main", "hello", "1.0-1", ["hello"]) |
205 | 240 | self.addPackage("precise", "main", "i386", "hello", "1.0-1", | 240 | self.addPackage("precise", "main", "amd64", "hello", "1.0-1", |
206 | 241 | fields={"Depends": "gettext%s" % qual}) | 241 | fields={"Depends": "gettext%s" % qual}) |
207 | 242 | self.addSource("precise", "main", "gettext", "0.18.1.1-5ubuntu3", | 242 | self.addSource("precise", "main", "gettext", "0.18.1.1-5ubuntu3", |
208 | 243 | ["gettext"]) | 243 | ["gettext"]) |
209 | 244 | package_fields = {} | 244 | package_fields = {} |
210 | 245 | if ma is not None: | 245 | if ma is not None: |
211 | 246 | package_fields["Multi-Arch"] = ma | 246 | package_fields["Multi-Arch"] = ma |
213 | 247 | self.addPackage("precise", "main", "i386", "gettext", | 247 | self.addPackage("precise", "main", "amd64", "gettext", |
214 | 248 | "0.18.1.1-5ubuntu3", fields=package_fields) | 248 | "0.18.1.1-5ubuntu3", fields=package_fields) |
215 | 249 | branch = "collection.precise" | 249 | branch = "collection.precise" |
216 | 250 | self.addSeed(branch, "base") | 250 | self.addSeed(branch, "base") |
217 | 251 | self.addSeedPackage(branch, "base", "hello") | 251 | self.addSeedPackage(branch, "base", "hello") |
219 | 252 | germinator = Germinator("i386") | 252 | germinator = Germinator("amd64") |
220 | 253 | archive = TagFile( | 253 | archive = TagFile( |
222 | 254 | "precise", "main", "i386", "file://%s" % self.archive_dir) | 254 | "precise", "main", "amd64", "file://%s" % self.archive_dir) |
223 | 255 | germinator.parse_archive(archive) | 255 | germinator.parse_archive(archive) |
224 | 256 | structure = self.openSeedStructure(branch) | 256 | structure = self.openSeedStructure(branch) |
225 | 257 | germinator.plant_seeds(structure) | 257 | germinator.plant_seeds(structure) |
226 | @@ -290,20 +290,20 @@ class TestGerminator(TestCase): | |||
227 | 290 | ): | 290 | ): |
228 | 291 | self.addSource("precise", "main", "hello", "1.0-1", ["hello"], | 291 | self.addSource("precise", "main", "hello", "1.0-1", ["hello"], |
229 | 292 | fields={"Build-Depends": "gettext%s" % qual}) | 292 | fields={"Build-Depends": "gettext%s" % qual}) |
231 | 293 | self.addPackage("precise", "main", "i386", "hello", "1.0-1") | 293 | self.addPackage("precise", "main", "amd64", "hello", "1.0-1") |
232 | 294 | self.addSource("precise", "main", "gettext", "0.18.1.1-5ubuntu3", | 294 | self.addSource("precise", "main", "gettext", "0.18.1.1-5ubuntu3", |
233 | 295 | ["gettext"]) | 295 | ["gettext"]) |
234 | 296 | package_fields = {} | 296 | package_fields = {} |
235 | 297 | if ma is not None: | 297 | if ma is not None: |
236 | 298 | package_fields["Multi-Arch"] = ma | 298 | package_fields["Multi-Arch"] = ma |
238 | 299 | self.addPackage("precise", "main", "i386", "gettext", | 299 | self.addPackage("precise", "main", "amd64", "gettext", |
239 | 300 | "0.18.1.1-5ubuntu3", fields=package_fields) | 300 | "0.18.1.1-5ubuntu3", fields=package_fields) |
240 | 301 | branch = "collection.precise" | 301 | branch = "collection.precise" |
241 | 302 | self.addSeed(branch, "base") | 302 | self.addSeed(branch, "base") |
242 | 303 | self.addSeedPackage(branch, "base", "hello") | 303 | self.addSeedPackage(branch, "base", "hello") |
244 | 304 | germinator = Germinator("i386") | 304 | germinator = Germinator("amd64") |
245 | 305 | archive = TagFile( | 305 | archive = TagFile( |
247 | 306 | "precise", "main", "i386", "file://%s" % self.archive_dir) | 306 | "precise", "main", "amd64", "file://%s" % self.archive_dir) |
248 | 307 | germinator.parse_archive(archive) | 307 | germinator.parse_archive(archive) |
249 | 308 | structure = self.openSeedStructure(branch) | 308 | structure = self.openSeedStructure(branch) |
250 | 309 | germinator.plant_seeds(structure) | 309 | germinator.plant_seeds(structure) |
251 | @@ -330,24 +330,24 @@ class TestGerminator(TestCase): | |||
252 | 330 | "gettext <!stage1> <!cross>, " | 330 | "gettext <!stage1> <!cross>, " |
253 | 331 | "base-files <stage1>, " | 331 | "base-files <stage1>, " |
254 | 332 | "gettext (<< 0.7) | debhelper (>= 9)"}) | 332 | "gettext (<< 0.7) | debhelper (>= 9)"}) |
256 | 333 | self.addPackage("precise", "main", "i386", "hello", "1.0-1") | 333 | self.addPackage("precise", "main", "amd64", "hello", "1.0-1") |
257 | 334 | self.addSource("precise", "main", "gettext", "0.8.1.1-5ubuntu3", | 334 | self.addSource("precise", "main", "gettext", "0.8.1.1-5ubuntu3", |
258 | 335 | ["gettext"]) | 335 | ["gettext"]) |
260 | 336 | self.addPackage("precise", "main", "i386", "gettext", | 336 | self.addPackage("precise", "main", "amd64", "gettext", |
261 | 337 | "0.8.1.1-5ubuntu3") | 337 | "0.8.1.1-5ubuntu3") |
262 | 338 | self.addSource("precise", "main", "base-files", "6.5ubuntu6", | 338 | self.addSource("precise", "main", "base-files", "6.5ubuntu6", |
263 | 339 | ["base-files"]) | 339 | ["base-files"]) |
265 | 340 | self.addPackage("precise", "main", "i386", "base-files", "6.5ubuntu6") | 340 | self.addPackage("precise", "main", "amd64", "base-files", "6.5ubuntu6") |
266 | 341 | self.addSource("precise", "main", "debhelper", "9.20120115ubuntu3", | 341 | self.addSource("precise", "main", "debhelper", "9.20120115ubuntu3", |
267 | 342 | ["debhelper"]) | 342 | ["debhelper"]) |
269 | 343 | self.addPackage("precise", "main", "i386", "debhelper", | 343 | self.addPackage("precise", "main", "amd64", "debhelper", |
270 | 344 | "9.20120115ubuntu3") | 344 | "9.20120115ubuntu3") |
271 | 345 | branch = "collection.precise" | 345 | branch = "collection.precise" |
272 | 346 | self.addSeed(branch, "base") | 346 | self.addSeed(branch, "base") |
273 | 347 | self.addSeedPackage(branch, "base", "hello") | 347 | self.addSeedPackage(branch, "base", "hello") |
275 | 348 | germinator = Germinator("i386") | 348 | germinator = Germinator("amd64") |
276 | 349 | archive = TagFile( | 349 | archive = TagFile( |
278 | 350 | "precise", "main", "i386", "file://%s" % self.archive_dir) | 350 | "precise", "main", "amd64", "file://%s" % self.archive_dir) |
279 | 351 | germinator.parse_archive(archive) | 351 | germinator.parse_archive(archive) |
280 | 352 | structure = self.openSeedStructure(branch) | 352 | structure = self.openSeedStructure(branch) |
281 | 353 | germinator.plant_seeds(structure) | 353 | germinator.plant_seeds(structure) |
282 | @@ -362,23 +362,23 @@ class TestGerminator(TestCase): | |||
283 | 362 | self.addSource("bionic", "main", "hello", "1.0-1", | 362 | self.addSource("bionic", "main", "hello", "1.0-1", |
284 | 363 | ["hello", "hello-dependency", "hello-bad"], | 363 | ["hello", "hello-dependency", "hello-bad"], |
285 | 364 | fields={"Maintainer": "Test Person <test@example.com>"}) | 364 | fields={"Maintainer": "Test Person <test@example.com>"}) |
287 | 365 | self.addPackage("bionic", "main", "i386", "hello", "1.0-1", | 365 | self.addPackage("bionic", "main", "amd64", "hello", "1.0-1", |
288 | 366 | fields={ | 366 | fields={ |
289 | 367 | "Maintainer": "Test Person <test@example.com>", | 367 | "Maintainer": "Test Person <test@example.com>", |
290 | 368 | "Depends": "hello-virtual (>= 2.0)", | 368 | "Depends": "hello-virtual (>= 2.0)", |
291 | 369 | }) | 369 | }) |
293 | 370 | self.addPackage("bionic", "main", "i386", "hello-bad", "2.0-1", | 370 | self.addPackage("bionic", "main", "amd64", "hello-bad", "2.0-1", |
294 | 371 | fields={"Source": "hello (= 1.0-1)", | 371 | fields={"Source": "hello (= 1.0-1)", |
295 | 372 | "Provides": "hello-virtual (= 1.0)"}) | 372 | "Provides": "hello-virtual (= 1.0)"}) |
297 | 373 | self.addPackage("bionic", "main", "i386", "hello-dependency", "1.0-1", | 373 | self.addPackage("bionic", "main", "amd64", "hello-dependency", "1.0-1", |
298 | 374 | fields={"Source": "hello", | 374 | fields={"Source": "hello", |
299 | 375 | "Provides": "hello-virtual (= 2.0)"}) | 375 | "Provides": "hello-virtual (= 2.0)"}) |
300 | 376 | branch = "ubuntu.bionic" | 376 | branch = "ubuntu.bionic" |
301 | 377 | self.addSeed(branch, "supported") | 377 | self.addSeed(branch, "supported") |
302 | 378 | self.addSeedPackage(branch, "supported", "hello") | 378 | self.addSeedPackage(branch, "supported", "hello") |
304 | 379 | germinator = Germinator("i386") | 379 | germinator = Germinator("amd64") |
305 | 380 | archive = TagFile( | 380 | archive = TagFile( |
307 | 381 | "bionic", "main", "i386", "file://%s" % self.archive_dir) | 381 | "bionic", "main", "amd64", "file://%s" % self.archive_dir) |
308 | 382 | germinator.parse_archive(archive) | 382 | germinator.parse_archive(archive) |
309 | 383 | 383 | ||
310 | 384 | self.assertIn("hello", germinator._sources) | 384 | self.assertIn("hello", germinator._sources) |
311 | @@ -403,7 +403,7 @@ class TestGerminator(TestCase): | |||
312 | 403 | branch = "collection.precise" | 403 | branch = "collection.precise" |
313 | 404 | self.addSeed(branch, "base") | 404 | self.addSeed(branch, "base") |
314 | 405 | self.addSeedSnap(branch, "base", "hello") | 405 | self.addSeedSnap(branch, "base", "hello") |
316 | 406 | germinator = Germinator("i386") | 406 | germinator = Germinator("amd64") |
317 | 407 | structure = self.openSeedStructure(branch) | 407 | structure = self.openSeedStructure(branch) |
318 | 408 | germinator.plant_seeds(structure) | 408 | germinator.plant_seeds(structure) |
319 | 409 | germinator.grow(structure) | 409 | germinator.grow(structure) |
320 | @@ -417,7 +417,7 @@ class TestGerminator(TestCase): | |||
321 | 417 | self.addSeed(branch, "base") | 417 | self.addSeed(branch, "base") |
322 | 418 | self.addSeedSnap(branch, "base", "(hello)") | 418 | self.addSeedSnap(branch, "base", "(hello)") |
323 | 419 | with self.assertLogs("germinate", level=logging.WARNING) as logs: | 419 | with self.assertLogs("germinate", level=logging.WARNING) as logs: |
325 | 420 | germinator = Germinator("i386") | 420 | germinator = Germinator("amd64") |
326 | 421 | structure = self.openSeedStructure(branch) | 421 | structure = self.openSeedStructure(branch) |
327 | 422 | germinator.plant_seeds(structure) | 422 | germinator.plant_seeds(structure) |
328 | 423 | germinator.grow(structure) | 423 | germinator.grow(structure) |
329 | diff --git a/germinate/tests/test_integration.py b/germinate/tests/test_integration.py | |||
330 | index 83cc74e..8d60b40 100644 | |||
331 | --- a/germinate/tests/test_integration.py | |||
332 | +++ b/germinate/tests/test_integration.py | |||
333 | @@ -45,9 +45,9 @@ class TestGerminate(TestCase): | |||
334 | 45 | def test_trivial(self): | 45 | def test_trivial(self): |
335 | 46 | self.addSource("warty", "main", "hello", "1.0-1", | 46 | self.addSource("warty", "main", "hello", "1.0-1", |
336 | 47 | ["hello", "hello-dependency"]) | 47 | ["hello", "hello-dependency"]) |
338 | 48 | self.addPackage("warty", "main", "i386", "hello", "1.0-1", | 48 | self.addPackage("warty", "main", "amd64", "hello", "1.0-1", |
339 | 49 | fields={"Depends": "hello-dependency"}) | 49 | fields={"Depends": "hello-dependency"}) |
341 | 50 | self.addPackage("warty", "main", "i386", "hello-dependency", "1.0-1", | 50 | self.addPackage("warty", "main", "amd64", "hello-dependency", "1.0-1", |
342 | 51 | fields={"Source": "hello"}) | 51 | fields={"Source": "hello"}) |
343 | 52 | self.addSeed("ubuntu.warty", "supported") | 52 | self.addSeed("ubuntu.warty", "supported") |
344 | 53 | self.addSeedPackage("ubuntu.warty", "supported", "hello") | 53 | self.addSeedPackage("ubuntu.warty", "supported", "hello") |
345 | @@ -65,7 +65,7 @@ class TestGerminate(TestCase): | |||
346 | 65 | # Need Packages | 65 | # Need Packages |
347 | 66 | self.addSource("warty", "main", "hello", "1.0-1", | 66 | self.addSource("warty", "main", "hello", "1.0-1", |
348 | 67 | ["hello", "hello-dependency"]) | 67 | ["hello", "hello-dependency"]) |
350 | 68 | self.addPackage("warty", "main", "i386", "hello-dependency", "1.0-1", | 68 | self.addPackage("warty", "main", "amd64", "hello-dependency", "1.0-1", |
351 | 69 | fields={"Source": "hello"}) | 69 | fields={"Source": "hello"}) |
352 | 70 | self.addSeed("ubuntu.warty", "supported") | 70 | self.addSeed("ubuntu.warty", "supported") |
353 | 71 | self.addSeedSnap("ubuntu.warty", "supported", "mycoolsnap") | 71 | self.addSeedSnap("ubuntu.warty", "supported", "mycoolsnap") |
354 | @@ -84,7 +84,7 @@ class TestGerminate(TestCase): | |||
355 | 84 | # Need Packages | 84 | # Need Packages |
356 | 85 | self.addSource("warty", "main", "hello", "1.0-1", | 85 | self.addSource("warty", "main", "hello", "1.0-1", |
357 | 86 | ["hello", "hello-dependency"]) | 86 | ["hello", "hello-dependency"]) |
359 | 87 | self.addPackage("warty", "main", "i386", "hello-dependency", "1.0-1", | 87 | self.addPackage("warty", "main", "amd64", "hello-dependency", "1.0-1", |
360 | 88 | fields={"Source": "hello"}) | 88 | fields={"Source": "hello"}) |
361 | 89 | self.addSeed("ubuntu.warty", "supported") | 89 | self.addSeed("ubuntu.warty", "supported") |
362 | 90 | self.addSeedSnap("ubuntu.warty", "supported", "mycoolsnap/classic") | 90 | self.addSeedSnap("ubuntu.warty", "supported", "mycoolsnap/classic") |
363 | diff --git a/man/germinate-pkg-diff.1 b/man/germinate-pkg-diff.1 | |||
364 | index 86c29f7..4fe76d8 100644 | |||
365 | --- a/man/germinate-pkg-diff.1 | |||
366 | +++ b/man/germinate-pkg-diff.1 | |||
367 | @@ -70,13 +70,13 @@ The default is | |||
368 | 70 | Fetch seeds for distribution | 70 | Fetch seeds for distribution |
369 | 71 | .Ar dist . | 71 | .Ar dist . |
370 | 72 | The default is | 72 | The default is |
372 | 73 | .Li ubuntu.bionic . | 73 | .Li ubuntu.focal . |
373 | 74 | .It Xo Fl d , | 74 | .It Xo Fl d , |
374 | 75 | .Fl Fl dist Ar dist Ns \&,... | 75 | .Fl Fl dist Ar dist Ns \&,... |
375 | 76 | .Xc | 76 | .Xc |
376 | 77 | Operate on the specified distributions. | 77 | Operate on the specified distributions. |
377 | 78 | The default is | 78 | The default is |
379 | 79 | .Li bionic . | 79 | .Li focal . |
380 | 80 | Listing multiple distributions may be useful, for example, when examining | 80 | Listing multiple distributions may be useful, for example, when examining |
381 | 81 | both a released distribution and its security updates. | 81 | both a released distribution and its security updates. |
382 | 82 | .It Xo Fl a , | 82 | .It Xo Fl a , |
383 | @@ -85,7 +85,7 @@ both a released distribution and its security updates. | |||
384 | 85 | Operate on architecture | 85 | Operate on architecture |
385 | 86 | .Ar arch . | 86 | .Ar arch . |
386 | 87 | The default is | 87 | The default is |
388 | 88 | .Li i386 . | 88 | .Li amd64 . |
389 | 89 | .El | 89 | .El |
390 | 90 | .Sh BUGS | 90 | .Sh BUGS |
391 | 91 | .Fl Fl mode Li r | 91 | .Fl Fl mode Li r |
392 | diff --git a/man/germinate-update-metapackage.1 b/man/germinate-update-metapackage.1 | |||
393 | index 6145362..b701db3 100644 | |||
394 | --- a/man/germinate-update-metapackage.1 | |||
395 | +++ b/man/germinate-update-metapackage.1 | |||
396 | @@ -198,9 +198,9 @@ the | |||
397 | 198 | source package in the Ubuntu archive: | 198 | source package in the Ubuntu archive: |
398 | 199 | .Bd -literal -offset indent | 199 | .Bd -literal -offset indent |
399 | 200 | [DEFAULT] | 200 | [DEFAULT] |
401 | 201 | dist: bionic | 201 | dist: focal |
402 | 202 | 202 | ||
404 | 203 | [bionic] | 203 | [focal] |
405 | 204 | seeds: desktop full active | 204 | seeds: desktop full active |
406 | 205 | architectures: i386 amd64 powerpc armhf arm64 ppc64el | 205 | architectures: i386 amd64 powerpc armhf arm64 ppc64el |
407 | 206 | seed_base: http://people.canonical.com/~ubuntu-archive/seeds/ | 206 | seed_base: http://people.canonical.com/~ubuntu-archive/seeds/ |
408 | @@ -213,7 +213,7 @@ archive_base/arm64: %(archive_base/ports)s | |||
409 | 213 | archive_base/ppc64el: %(archive_base/ports)s | 213 | archive_base/ppc64el: %(archive_base/ports)s |
410 | 214 | components: main restricted universe | 214 | components: main restricted universe |
411 | 215 | 215 | ||
413 | 216 | [bionic/bzr] | 216 | [focal/bzr] |
414 | 217 | seed_base: bzr+ssh://bazaar.launchpad.net/~kubuntu-dev/ubuntu-seeds/ bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/ | 217 | seed_base: bzr+ssh://bazaar.launchpad.net/~kubuntu-dev/ubuntu-seeds/ bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/ |
415 | 218 | seed_dist: kubuntu.%(dist)s | 218 | seed_dist: kubuntu.%(dist)s |
416 | 219 | .Ed | 219 | .Ed |
417 | diff --git a/man/germinate.1 b/man/germinate.1 | |||
418 | index 4c32804..1d3ef15 100644 | |||
419 | --- a/man/germinate.1 | |||
420 | +++ b/man/germinate.1 | |||
421 | @@ -241,7 +241,7 @@ then you would use the options | |||
422 | 241 | Fetch seeds for distribution | 241 | Fetch seeds for distribution |
423 | 242 | .Ar dist . | 242 | .Ar dist . |
424 | 243 | The default is | 243 | The default is |
426 | 244 | .Li ubuntu.bionic . | 244 | .Li ubuntu.focal . |
427 | 245 | .Pp | 245 | .Pp |
428 | 246 | When fetching seeds from git, the part after the rightmost | 246 | When fetching seeds from git, the part after the rightmost |
429 | 247 | .Sq \&. | 247 | .Sq \&. |
430 | @@ -267,7 +267,7 @@ across all archives will win. | |||
431 | 267 | .Xc | 267 | .Xc |
432 | 268 | Operate on the specified distributions. | 268 | Operate on the specified distributions. |
433 | 269 | The default is | 269 | The default is |
435 | 270 | .Li bionic . | 270 | .Li focal . |
436 | 271 | Listing multiple distributions may be useful, for example, when examining | 271 | Listing multiple distributions may be useful, for example, when examining |
437 | 272 | both a released distribution and its security updates. | 272 | both a released distribution and its security updates. |
438 | 273 | .It Xo Fl a , | 273 | .It Xo Fl a , |
439 | @@ -276,7 +276,7 @@ both a released distribution and its security updates. | |||
440 | 276 | Operate on architecture | 276 | Operate on architecture |
441 | 277 | .Ar arch . | 277 | .Ar arch . |
442 | 278 | The default is | 278 | The default is |
444 | 279 | .Li i386 . | 279 | .Li amd64 . |
445 | 280 | .It Xo Fl c , | 280 | .It Xo Fl c , |
446 | 281 | .Fl Fl components Ar component Ns \&,... | 281 | .Fl Fl components Ar component Ns \&,... |
447 | 282 | .Xc | 282 | .Xc |
448 | diff --git a/tox.ini b/tox.ini | |||
449 | index ec44f96..d5c3e87 100644 | |||
450 | --- a/tox.ini | |||
451 | +++ b/tox.ini | |||
452 | @@ -1,7 +1,7 @@ | |||
453 | 1 | [tox] | 1 | [tox] |
454 | 2 | # Note that only environments where you have a suitable version of | 2 | # Note that only environments where you have a suitable version of |
455 | 3 | # python-apt installed on the host system will work. | 3 | # python-apt installed on the host system will work. |
457 | 4 | envlist = py27,py33,py34,py35,py36,py37 | 4 | envlist = py27,py33,py34,py35,py36,py37,py38 |
458 | 5 | 5 | ||
459 | 6 | [testenv] | 6 | [testenv] |
460 | 7 | sitepackages = true | 7 | sitepackages = true |
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.