El Capitan 升级后无法启动 ipython

Can't launch ipython after El Capitan upgrade

有谁知道如何撤消升级到 El Capitan 后对路径和权限所做的更改。具体来说,似乎 OS X 现在正在使用系统 python 而不是我的 Canopy 安装。

这些看起来不错:

Michaels-Mac-mini:~ mellis$ which python
/Users/mellis/Library/Enthought/Canopy_64bit/User/bin/python

Michaels-Mac-mini:~ mellis$ which ipython
/Users/mellis/bin/ipython

但尝试启动 ipython 失败:

Michaels-Mac-mini:~ mellis$ ipython
Traceback (most recent call last):
  File "/Users/mellis/bin/ipython", line 5, in <module>
    from pkg_resources import load_entry_point
  File "/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/pyth on/pkg_resources.py", line 2793, in <module>
working_set.require(__requires__)
  File "/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/pkg_resources.py", line 673, in require
    needed = self.resolve(parse_requirements(requirements))
  File "/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/pkg_resources.py", line 576, in resolve
    raise DistributionNotFound(req)
pkg_resources.DistributionNotFound: ipython==0.11

我安装的 Canopy 软件包的完整更新,包括 ipython 似乎已经解决了这个问题。