Merge lp:~jelmer/brz/missing-launchpadlib into lp:brz/3.0

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/missing-launchpadlib
Merge into: lp:brz/3.0
Diff against target: 107 lines (+41/-19)
5 files modified
breezy/plugins/launchpad/lp_api.py (+0/-17)
breezy/plugins/launchpad/lp_directory.py (+1/-1)
breezy/plugins/launchpad/lp_registration.py (+1/-1)
breezy/plugins/launchpad/uris.py (+36/-0)
doc/en/release-notes/brz-3.0.txt (+3/-0)
To merge this branch: bzr merge lp:~jelmer/brz/missing-launchpadlib
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+374752@code.launchpad.net

Commit message

Allow running tests without launchpadlib installed.

Description of the change

Allow running tests without launchpadlib installed.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'breezy/plugins/launchpad/lp_api.py'
--- breezy/plugins/launchpad/lp_api.py 2019-02-14 18:55:19 +0000
+++ breezy/plugins/launchpad/lp_api.py 2019-10-27 04:29:46 +0000
@@ -69,23 +69,6 @@
69MINIMUM_LAUNCHPADLIB_VERSION = (1, 6, 3)69MINIMUM_LAUNCHPADLIB_VERSION = (1, 6, 3)
7070
7171
72# We use production as the default because edge has been deprecated circa
73# 2010-11 (see bug https://bugs.launchpad.net/bzr/+bug/583667)
74DEFAULT_INSTANCE = 'production'
75
76LAUNCHPAD_DOMAINS = {
77 'production': 'launchpad.net',
78 'staging': 'staging.launchpad.net',
79 'qastaging': 'qastaging.launchpad.net',
80 'demo': 'demo.launchpad.net',
81 'dev': 'launchpad.dev',
82 }
83
84LAUNCHPAD_BAZAAR_DOMAINS = [
85 'bazaar.%s' % domain
86 for domain in LAUNCHPAD_DOMAINS.values()]
87
88
89def get_cache_directory():72def get_cache_directory():
90 """Return the directory to cache launchpadlib objects in."""73 """Return the directory to cache launchpadlib objects in."""
91 return osutils.pathjoin(config.config_dir(), 'launchpad')74 return osutils.pathjoin(config.config_dir(), 'launchpad')
9275
=== modified file 'breezy/plugins/launchpad/lp_directory.py'
--- breezy/plugins/launchpad/lp_directory.py 2019-02-09 02:59:15 +0000
+++ breezy/plugins/launchpad/lp_directory.py 2019-10-27 04:29:46 +0000
@@ -35,7 +35,7 @@
35 )35 )
36from ...i18n import gettext36from ...i18n import gettext
3737
38from .lp_api import (38from .uris import (
39 DEFAULT_INSTANCE,39 DEFAULT_INSTANCE,
40 LAUNCHPAD_DOMAINS,40 LAUNCHPAD_DOMAINS,
41 )41 )
4242
=== modified file 'breezy/plugins/launchpad/lp_registration.py'
--- breezy/plugins/launchpad/lp_registration.py 2019-01-18 01:19:29 +0000
+++ breezy/plugins/launchpad/lp_registration.py 2019-10-27 04:29:46 +0000
@@ -48,7 +48,7 @@
48 )48 )
49from ...transport.http import _urllib2_wrappers49from ...transport.http import _urllib2_wrappers
5050
51from .lp_api import (51from .uris import (
52 DEFAULT_INSTANCE,52 DEFAULT_INSTANCE,
53 LAUNCHPAD_DOMAINS,53 LAUNCHPAD_DOMAINS,
54 LAUNCHPAD_BAZAAR_DOMAINS,54 LAUNCHPAD_BAZAAR_DOMAINS,
5555
=== added file 'breezy/plugins/launchpad/uris.py'
--- breezy/plugins/launchpad/uris.py 1970-01-01 00:00:00 +0000
+++ breezy/plugins/launchpad/uris.py 2019-10-27 04:29:46 +0000
@@ -0,0 +1,36 @@
1# Copyright (C) 2009-2012 Canonical Ltd
2#
3# This program is free software; you can redistribute it and/or modify
4# it under the terms of the GNU General Public License as published by
5# the Free Software Foundation; either version 2 of the License, or
6# (at your option) any later version.
7#
8# This program is distributed in the hope that it will be useful,
9# but WITHOUT ANY WARRANTY; without even the implied warranty of
10# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11# GNU General Public License for more details.
12#
13# You should have received a copy of the GNU General Public License
14# along with this program; if not, write to the Free Software
15# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
17"""Launchpad URIs."""
18
19from __future__ import absolute_import
20
21
22# We use production as the default because edge has been deprecated circa
23# 2010-11 (see bug https://bugs.launchpad.net/bzr/+bug/583667)
24DEFAULT_INSTANCE = 'production'
25
26LAUNCHPAD_DOMAINS = {
27 'production': 'launchpad.net',
28 'staging': 'staging.launchpad.net',
29 'qastaging': 'qastaging.launchpad.net',
30 'demo': 'demo.launchpad.net',
31 'dev': 'launchpad.dev',
32 }
33
34LAUNCHPAD_BAZAAR_DOMAINS = [
35 'bazaar.%s' % domain
36 for domain in LAUNCHPAD_DOMAINS.values()]
037
=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt 2019-10-13 16:48:38 +0000
+++ doc/en/release-notes/brz-3.0.txt 2019-10-27 04:29:46 +0000
@@ -36,6 +36,9 @@
36 significantly slow down startup on some platforms.36 significantly slow down startup on some platforms.
37 (Jelmer Vernooij, #1832868)37 (Jelmer Vernooij, #1832868)
3838
39 * Allow running tests without launchpadlib installed.
40 (Jelmer Vernooij, #1849988)
41
39Documentation42Documentation
40*************43*************
4144

Subscribers

People subscribed via source and target branches