python27Packages.ipython: 5.7.0 -> 5.8.0, python36Packages.ipython 5.7.0 -> 7.1.1

- removed patch for sage as it is applied in most recent release.
 - simplified `ipython` attribute no need for explicit version `5`
   vs. `6`.
 - upgrade to most recent version of ipython
This commit is contained in:
Chris Ostrouchov 2018-11-03 09:32:14 -04:00 committed by Frederik Rietdijk
parent 7c4d36fc64
commit 189acf712d
3 changed files with 11 additions and 30 deletions

View file

@ -26,27 +26,17 @@
buildPythonPackage rec {
pname = "ipython";
version = "5.7.0";
version = "5.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "0g1jm06qriq48m58311cs7askp83ipq3yq96hv4kg431nxzkmd4d";
sha256 = "4bac649857611baaaf76bc82c173aa542f7486446c335fe1a6c05d0d491c8906";
};
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace setup.py --replace "'gnureadline'" " "
'';
patches = [
# improve cython support, needed by sage, accepted upstream
# https://github.com/ipython/ipython/pull/11139
(fetchpatch {
name = "signature-use-inspect.patch";
url = "https://github.com/ipython/ipython/commit/8d399b98d3ed5c765835594100c4d36fb2f739dc.patch";
sha256 = "1r7v9clwwbskmj4y160vcj6g0vzqbvnj4y1bm2n4bskafapm42g0";
})
];
buildInputs = [ glibcLocales ];
checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock;

View file

@ -12,22 +12,21 @@
, jedi
, decorator
, pickleshare
, simplegeneric
, traitlets
, prompt_toolkit
, pexpect
, appnope
, typing
, backcall
}:
buildPythonPackage rec {
pname = "ipython";
version = "6.5.0";
version = "7.1.1";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "b0f2ef9eada4a68ef63ee10b6dde4f35c840035c50fd24265f8052c98947d5a4";
sha256 = "b10a7ddd03657c761fc503495bc36471c8158e3fc948573fb9fe82a7029d8efd";
};
prePatch = lib.optionalString stdenv.isDarwin ''
@ -42,13 +41,12 @@ buildPythonPackage rec {
jedi
decorator
pickleshare
simplegeneric
traitlets
prompt_toolkit
pygments
pexpect
backcall
] ++ lib.optionals stdenv.isDarwin [appnope]
++ lib.optionals (pythonOlder "3.5") [ typing ];
] ++ lib.optionals stdenv.isDarwin [appnope];
LC_ALL="en_US.UTF-8";
@ -58,11 +56,6 @@ buildPythonPackage rec {
nosetests
'';
# IPython 6.0.0 and above does not support Python < 3.3.
# The last IPython version to support older Python versions
# is 5.3.x.
disabled = pythonOlder "3.3";
meta = {
description = "IPython: Productive Interactive Computing";
homepage = http://ipython.org/;

View file

@ -2543,12 +2543,10 @@ in {
ipyparallel = callPackage ../development/python-modules/ipyparallel { };
# Newer versions of IPython no longer support Python 2.7.
ipython = if isPy27 then self.ipython_5 else self.ipython_6;
ipython_5 = callPackage ../development/python-modules/ipython/5.nix { };
ipython_6 = callPackage ../development/python-modules/ipython { };
ipython = if pythonOlder "3.5" then
callPackage ../development/python-modules/ipython/5.nix { }
else
callPackage ../development/python-modules/ipython { };
ipython_genutils = callPackage ../development/python-modules/ipython_genutils { };