Ibid

Merge lp:~stefanor/ibid/script-dependencies-651990 into lp:~ibid-core/ibid/old-trunk-1.6

  1. script-dependencies-651990
  2. Merge into old-trunk-1.6
Proposed by Stefano Rivera
Status: Merged
Approved by: Stefano Rivera
Approved revision: 909
Merged at revision: 1005
Proposed branch: lp:~stefanor/ibid/script-dependencies-651990
Merge into: lp:~ibid-core/ibid/old-trunk-1.6
Diff against target: 87 lines (+29/-10)
3 files modified
scripts/ibid-knab-import (+8/-2)
scripts/ibid-memgraph (+11/-4)
scripts/ibid-objgraph (+10/-4)
To merge this branch: bzr merge lp:~stefanor/ibid/script-dependencies-651990
Reviewer Review Type Date Requested Status
marcog (community) Approve
Jonathan Hitchcock Approve
Max Rabkin Approve
Review via email: mp+47152@code.launchpad.net

Commit message

Catch ImportErrors for packages we don't require in setup.py

To post a comment you must log in.
Revision history for this message
Max Rabkin (max-rabkin) :
review: Approve
Revision history for this message
Jonathan Hitchcock (vhata) :
review: Approve
Revision history for this message
marcog (marco-gallotta) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/ibid-knab-import'
2--- scripts/ibid-knab-import 2010-04-13 10:07:32 +0000
3+++ scripts/ibid-knab-import 2011-01-22 10:31:12 +0000
4@@ -1,15 +1,21 @@
5 #!/usr/bin/env python
6-# Copyright (c) 2009-2010, Michael Gorven, Stefano Rivera
7+# Copyright (c) 2009-2011, Michael Gorven, Stefano Rivera
8 # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
9
10 from os.path import dirname
11 from sys import argv, path, exit, stderr, stdout
12
13-from chardet import detect
14 from dateutil.tz import tzlocal, tzutc
15 from sqlalchemy import create_engine, Column, Integer, String, DateTime, Text
16 from sqlalchemy.ext.declarative import declarative_base
17 from sqlalchemy.orm import sessionmaker
18+try:
19+ from chardet import detect
20+except ImportError:
21+ print >> stderr, ('This script requires chardet '
22+ '(python-chardet on Debian/Ubuntu).\n'
23+ 'Please install it and try again.')
24+ exit(1)
25
26 path.insert(0, '.')
27
28
29=== modified file 'scripts/ibid-memgraph'
30--- scripts/ibid-memgraph 2010-01-17 20:08:12 +0000
31+++ scripts/ibid-memgraph 2011-01-22 10:31:12 +0000
32@@ -1,5 +1,5 @@
33 #!/usr/bin/env python
34-# Copyright (c) 2009, Stefano Rivera
35+# Copyright (c) 2009-2011, Stefano Rivera
36 # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
37
38 import gzip
39@@ -7,9 +7,16 @@
40 import sys
41
42 import dateutil
43-import matplotlib.pyplot as pyplot
44-from matplotlib.dates import date2num
45-import numpy
46+try:
47+ import matplotlib.pyplot as pyplot
48+ from matplotlib.dates import date2num
49+ import numpy
50+except ImportError:
51+ print >> sys.stderr, ('This script requires matplotlib '
52+ '(python-matplotlib on Debian/Ubuntu).\n'
53+ 'Please install it and try again.')
54+ sys.exit(1)
55+
56
57 parser = optparse.OptionParser(usage="""%prog logfile
58 logfile is a memory log file (possibly gzipped)""")
59
60=== modified file 'scripts/ibid-objgraph'
61--- scripts/ibid-objgraph 2010-01-17 20:08:12 +0000
62+++ scripts/ibid-objgraph 2011-01-22 10:31:12 +0000
63@@ -1,5 +1,5 @@
64 #!/usr/bin/env python
65-# Copyright (c) 2009, Stefano Rivera
66+# Copyright (c) 2009-2011, Stefano Rivera
67 # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
68
69 import gzip
70@@ -7,9 +7,15 @@
71 import sys
72
73 import dateutil
74-import matplotlib.pyplot as pyplot
75-from matplotlib.dates import date2num
76-import numpy
77+try:
78+ import matplotlib.pyplot as pyplot
79+ from matplotlib.dates import date2num
80+ import numpy
81+except ImportError:
82+ print >> sys.stderr, ('This script requires matplotlib '
83+ '(python-matplotlib on Debian/Ubuntu).\n'
84+ 'Please install it and try again.')
85+ sys.exit(1)
86
87 from ibid.compat import json
88

Subscribers

People subscribed via source and target branches