Skip to content

Commit d27d36c

Browse files
committed
Merge pull request matplotlib#3162 from tacaswell/tornado_noreq
BLD : made tornado an optional external package
2 parents 0076b7b + 1757167 commit d27d36c

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

setupext.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,7 @@ def get_install_requires(self):
11461146
return [dateutil]
11471147

11481148

1149-
class Tornado(SetupPackage):
1149+
class Tornado(OptionalPackage):
11501150
name = "tornado"
11511151

11521152
def check(self):
@@ -1160,9 +1160,6 @@ def check(self):
11601160

11611161
return "using tornado version %s" % tornado.version
11621162

1163-
def get_install_requires(self):
1164-
return ['tornado']
1165-
11661163

11671164
class Pyparsing(SetupPackage):
11681165
name = "pyparsing"
@@ -1879,14 +1876,14 @@ def check_requirements(self):
18791876
try:
18801877
# Try in-process
18811878
msg = self.callback(self)
1882-
1879+
18831880
except RuntimeError:
18841881
raise CheckFailed("Could not import: are PyQt4 & PyQt5 both installed?")
1885-
1882+
18861883
except:
18871884
# Raise any other exceptions
18881885
raise
1889-
1886+
18901887
else:
18911888
# Multiprocessing OK
18921889
try:
@@ -1897,8 +1894,8 @@ def check_requirements(self):
18971894
finally:
18981895
# Tidy up multiprocessing
18991896
p.close()
1900-
p.join()
1901-
1897+
p.join()
1898+
19021899
return msg
19031900

19041901

0 commit comments

Comments
 (0)