diff options
| author | Robin Gloster <mail@glob.in> | 2017-10-23 13:40:02 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-10-24 15:31:51 +0200 |
| commit | c581dbfab342e3aac00b7d69b5dfcfe08bcdc6f7 (patch) | |
| tree | 683f926bfc62868f0a0c4b5017827fd0ba6676eb /pkgs | |
| parent | 817b7bb3491dc0931bd508a57fcca57c67121ac0 (diff) | |
| download | nixpkgs-c581dbfab342e3aac00b7d69b5dfcfe08bcdc6f7.tar nixpkgs-c581dbfab342e3aac00b7d69b5dfcfe08bcdc6f7.tar.gz nixpkgs-c581dbfab342e3aac00b7d69b5dfcfe08bcdc6f7.tar.bz2 nixpkgs-c581dbfab342e3aac00b7d69b5dfcfe08bcdc6f7.tar.lz nixpkgs-c581dbfab342e3aac00b7d69b5dfcfe08bcdc6f7.tar.xz nixpkgs-c581dbfab342e3aac00b7d69b5dfcfe08bcdc6f7.tar.zst nixpkgs-c581dbfab342e3aac00b7d69b5dfcfe08bcdc6f7.zip | |
python.pkgs.notebook: 5.0.0 -> 5.2.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/notebook/default.nix | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 3a24c5566bf..c30e6e5e77d 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -2,8 +2,9 @@ , buildPythonPackage , fetchPypi , nose +, nose_warnings_filters , glibcLocales -, isPy27 +, isPy3k , mock , jinja2 , tornado @@ -21,32 +22,39 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.0.0"; + version = "5.2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1cea3bbbd03c8e5842a1403347a8cc8134486b3ce081a2e5b1952a00ea66ed54"; + sha256 = "1sh3jkkmjzv17c3r8ii3kfhpxi6dkjk846b2lfy71g9qwqdcvbvz"; }; - LC_ALL = "en_US.UTF-8"; + LC_ALL = "en_US.utf8"; - buildInputs = [nose glibcLocales] ++ lib.optionals isPy27 [mock]; + buildInputs = [ nose glibcLocales ] + ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]); - propagatedBuildInputs = [jinja2 tornado ipython_genutils traitlets jupyter_core - jupyter_client nbformat nbconvert ipykernel terminado requests pexpect ]; + propagatedBuildInputs = [ + jinja2 tornado ipython_genutils traitlets jupyter_core + jupyter_client nbformat nbconvert ipykernel terminado requests pexpect + ]; + # disable warning_filters + preCheck = lib.optionalString (!isPy3k) '' + echo "" > setup.cfg + cat setup.cfg + ''; checkPhase = '' - nosetests -v + runHook preCheck + mkdir tmp + HOME=tmp nosetests -v ''; - # Certain tests fail due to being in a chroot. - # PermissionError - doCheck = false; meta = { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; homepage = http://jupyter.org/; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh globin ]; }; -} \ No newline at end of file +} |