Merge branch 'master' into develop

* master:
  Change gnureadline with prompt toolkit for windows users
This commit is contained in:
Donne Martin
2017-04-03 06:26:30 -04:00

View File

@@ -3,7 +3,6 @@ backports.shutil-get-terminal-size>=1.0.0,<2.0.0
decorator>=4.0.9,<5.0.0
entrypoints>=0.2.2,<1.0.0
enum34>=1.1.6,<2.0.0
gnureadline>=6.3.3,<7.0.0
ipykernel>=4.3.1,<5.0.0
ipython>=4.2.0,<5.0.0
ipython-genutils>=0.1.0,<1.0.0
@@ -20,6 +19,7 @@ nose>=1.3.7,<2.0.0
notebook>=4.2.1,<5.0.0
pexpect>=4.1.0,<5.0.0
pickleshare>=0.7.2,<1.0.0
prompt_toolkit>=1.0.0
ptyprocess>=0.5.1,<1.0.0
Pygments>=2.1.3,<3.0.0
pyzmq>=15.2.0,<16.0.0