Skip to content

Commit

Permalink
Merge pull request matplotlib#3482 from tacaswell/six_dep
Browse files Browse the repository at this point in the history
BLD : improve how six dependency is handled
  • Loading branch information
pelson committed Feb 1, 2015
2 parents e79a583 + 73cc574 commit 1550439
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions setupext.py
Original file line number Diff line number Diff line change
Expand Up @@ -1186,12 +1186,17 @@ def check(self):
import six
except ImportError:
return (
"six was not found.")
"six was not found."
"pip will attempt to install it "
"after matplotlib.")

if not is_min_version(six.__version__, self.min_version):
raise CheckFailed(
"Requires six %s or later. Found %s." %
(self.min_version, six.__version__))
return ("The installed version of six is {inst_ver} but "
"a the minimum required version is {min_ver}. "
"pip/easy install will attempt to install a "
"newer version."
).format(min_ver=self.min_version,
inst_ver=six.__version__)

return "using six version %s" % six.__version__

Expand Down

0 comments on commit 1550439

Please sign in to comment.