Merge launchpad:master into launchpad:db-devel

Proposed by Colin Watson
Status: Merged
Merged at revision: c8098b989a584ec2ecc82ee03ad4b5e0f4b9f613
Proposed branch: launchpad:master
Merge into: launchpad:db-devel
Diff against target: 85 lines (+10/-11)
6 files modified
doc/_static/.gitignore (+0/-0)
doc/_templates/.gitignore (+0/-0)
lib/lp/answers/configure.zcml (+0/-2)
lib/lp/app/tests/test_help.py (+0/-4)
lib/lp/services/mail/tests/test_stub.py (+8/-5)
scripts/update-version-info.sh (+2/-0)
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+373579@code.launchpad.net

Commit message

Manually merge from master to fix building on git

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/doc/_static/.gitignore b/doc/_static/.gitignore
2new file mode 100644
3index 0000000..e69de29
4--- /dev/null
5+++ b/doc/_static/.gitignore
6diff --git a/doc/_templates/.gitignore b/doc/_templates/.gitignore
7new file mode 100644
8index 0000000..e69de29
9--- /dev/null
10+++ b/doc/_templates/.gitignore
11diff --git a/lib/lp/answers/configure.zcml b/lib/lp/answers/configure.zcml
12index dd3d075..9735be8 100644
13--- a/lib/lp/answers/configure.zcml
14+++ b/lib/lp/answers/configure.zcml
15@@ -269,7 +269,5 @@
16 <allow interface="lp.services.webapp.vocabulary.IHugeVocabulary"/>
17 </class>
18
19- <lp:help-folder folder="help" name="+help-answers"/>
20-
21 <webservice:register module="lp.answers.interfaces.webservice" />
22 </configure>
23diff --git a/lib/lp/app/tests/test_help.py b/lib/lp/app/tests/test_help.py
24index fb44bf6..e4ef38a 100644
25--- a/lib/lp/app/tests/test_help.py
26+++ b/lib/lp/app/tests/test_help.py
27@@ -35,10 +35,6 @@ class TestHelpSystemSetup(unittest.TestCase):
28 "Expected help folder %s, got %s" % (
29 expected_folder_path, view.folder))
30
31- def test_answers_help_folder(self):
32- self.assertHasHelpFolderView(
33- '+help-answers', os.path.join(ROOT, 'lib/lp/answers/help'))
34-
35 def test_blueprints_help_folder(self):
36 self.assertHasHelpFolderView(
37 '+help-blueprints', os.path.join(ROOT, 'lib/lp/blueprints/help'))
38diff --git a/lib/lp/services/mail/tests/test_stub.py b/lib/lp/services/mail/tests/test_stub.py
39index f91edad..095af90 100644
40--- a/lib/lp/services/mail/tests/test_stub.py
41+++ b/lib/lp/services/mail/tests/test_stub.py
42@@ -101,16 +101,19 @@ def test_simple_sendmail():
43
44 The message has a number of additional headers added by default.
45 'X-Generated-By' not only indicates that the source is Launchpad, but
46- shows the bzr revision and instance name.
47-
48- >>> message['X-Generated-By'].replace('\n\t', '\n ')
49- 'Launchpad (canonical.com); Revision="1999";\n Instance="launchpad-lazr.conf"'
50+ shows the git revision and instance name.
51
52+ >>> message.get_params(header='X-Generated-By')
53+ ... # doctest: +NORMALIZE_WHITESPACE
54+ [('Launchpad (canonical.com)', ''),
55+ ('revision', '0000000000000000000000000000000000000000'),
56+ ('instance', 'launchpad-lazr.conf')]
57 """
58
59
60 def test_suite():
61 suite = DocTestSuite(checker=RENormalizing([
62- (re.compile(r'Revision="\d+"'), 'Revision="1999"')]))
63+ (re.compile(r"'revision', '[0-9a-f]+'"),
64+ "'revision', '%s'" % ('0' * 40))]))
65 suite.layer = LaunchpadFunctionalLayer
66 return suite
67diff --git a/scripts/update-version-info.sh b/scripts/update-version-info.sh
68index d888e6a..3b56737 100755
69--- a/scripts/update-version-info.sh
70+++ b/scripts/update-version-info.sh
71@@ -17,6 +17,7 @@ if [ -d .git ]; then
72
73 branch_nick="$(git rev-parse --abbrev-ref HEAD | sed "s/'/\\\\'/g")"
74 revision_id="$(git rev-parse HEAD)"
75+ date="$(git show -s --format=%ci HEAD)"
76 cat > $newfile <<EOF
77 #! /usr/bin/env python
78
79@@ -24,6 +25,7 @@ from __future__ import print_function
80
81 version_info = {
82 'branch_nick': u'$branch_nick',
83+ 'date': u'$date',
84 'revision_id': u'$revision_id',
85 }
86

Subscribers

People subscribed via source and target branches

to status/vote changes: