click

Merge lp:~xnox/click/lp1522608 into lp:click/devel

  1. lp1522608
  2. Merge into devel
Proposed by Dimitri John Ledkov on 2015-12-03
Status: Merged
Merged at revision: 590
Proposed branch: lp:~xnox/click/lp1522608
Merge into: lp:click/devel
Diff against target: 13 lines (+3/-0)
1 file modified
bin/click (+3/-0)
To merge this branch: bzr merge lp:~xnox/click/lp1522608
Reviewer Review Type Date Requested Status
Colin Watson 2015-12-03 Approve on 2015-12-11
Michael Vogt 2015-12-03 Pending
Review via email: mp+279522@code.launchpad.net

Commit Message

Require specific Click version, to avoid gi warnings that fail test-suite.

Description of the Change

Require specific Click version, to avoid gi warnings that fail test-suite.

To post a comment you must log in.
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/click'
2--- bin/click 2015-11-24 12:57:49 +0000
3+++ bin/click 2015-12-03 22:56:23 +0000
4@@ -28,6 +28,9 @@
5 # Support running from the build tree.
6 sys.path.insert(0, os.path.join(sys.path[0], os.pardir))
7
8+import gi
9+gi.require_version('Click', '0.4')
10+
11 # There is an unfortunate name clash with
12 # https://pypi.python.org/pypi/click; try to detect this and take evasive
13 # action.

Subscribers

People subscribed via source and target branches