From 7b6b7f6b78fbb47812eef116b85e58f4c4ceb70a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:26:27 +0100 Subject: [PATCH 01/24] Python Flit: run tests by default --- .../python/build-python-package-flit.nix | 13 ++++++++----- .../interpreters/python/build-python-package.nix | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/python/build-python-package-flit.nix b/pkgs/development/interpreters/python/build-python-package-flit.nix index 8628c3df769..1beff0ebd83 100644 --- a/pkgs/development/interpreters/python/build-python-package-flit.nix +++ b/pkgs/development/interpreters/python/build-python-package-flit.nix @@ -1,6 +1,7 @@ # This function provides specific bits for building a flit-based Python package. -{ flit +{ python +, flit }: { ... } @ attrs: @@ -13,7 +14,9 @@ attrs // { runHook postBuild ''; - # Flit packages do not come with tests. - installCheckPhase = attrs.checkPhase or ":"; - doCheck = attrs.doCheck or false; -} \ No newline at end of file + # Flit packages, like setuptools packages, might have tests. + installCheckPhase = attrs.checkPhase or '' + ${python.interpreter} -m unittest discover + ''; + doCheck = attrs.doCheck or true; +} diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index e15405e2981..b26bf1539cd 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -12,7 +12,7 @@ let setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python bootstrapped-pip; }; - flit-specific = import ./build-python-package-flit.nix { inherit flit; }; + flit-specific = import ./build-python-package-flit.nix { inherit python flit; }; wheel-specific = import ./build-python-package-wheel.nix { }; common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; in @@ -34,4 +34,4 @@ let else if format == "other" then {} else throw "Unsupported format ${format}"; -in mkPythonDerivation ( attrs // formatspecific ) \ No newline at end of file +in mkPythonDerivation ( attrs // formatspecific ) From 695ff0dc09b304f2e0575081c52189893c2f38bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:38:58 +0100 Subject: [PATCH 02/24] pythonPackages: new fetchers Inspired by https://github.com/NixOS/nixpkgs/pull/22257. It is recommend to use fetchpypi and, when fetching a wheel, to pass `format = "wheel"` (typically you can just `inherit format;`). The hash type is fixed (for now) because this is the hash type PyPI uses. --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 60d9a1334dc..471323c179a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -37,9 +37,30 @@ let graphiteVersion = "0.9.15"; + fetchwheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}: + # Fetch a wheel. By default we fetch an universal wheel. + # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments. + let + url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl"; + in pkgs.fetchurl {inherit url sha256;}; + + fetchtarball = {pname, version, sha256}: + # Fetch a tarball. + let + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; + in pkgs.fetchurl {inherit url sha256;}; + + fetchpypi = {format ? "setuptools", ... } @attrs: + let + fetcher = (if format == "wheel" then fetchwheel + else if format == "setuptools" then fetchtarball + else throw "Unsupported kind ${kind}"); + in fetcher (builtins.removeAttrs attrs ["format"]); + in { inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; + inherit fetchwheel fetchtarball fetchpypi; # helpers From 4d57cd49c2a20da4095b67f4dce1775211c21c8b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:39:57 +0100 Subject: [PATCH 03/24] pythonPackages.configparser: 3.3.0r2 -> 3.5.0 --- pkgs/top-level/python-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 471323c179a..c1feea1b6a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4103,7 +4103,7 @@ in { # Backported version of the ConfigParser library of Python 3.3 configparser = if isPy3k then null else buildPythonPackage rec { name = "configparser-${version}"; - version = "3.3.0r2"; + version = "3.5.0"; # running install_egg_info # error: [Errno 9] Bad file descriptor: '' @@ -4111,9 +4111,12 @@ in { src = pkgs.fetchurl { url = "mirror://pypi/c/configparser/${name}.tar.gz"; - sha256 = "6a2318590dfc4013fc5bf53c2bec14a8cb455a232295eb282a13f94786c4b0b2"; + sha256 = "5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a"; }; + # No tests available + doCheck = false; + meta = { maintainers = [ ]; platforms = platforms.all; From 1658e7a80cb8aaf1e3cf4efacc2b028ee98ccfcb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:40:11 +0100 Subject: [PATCH 04/24] pythonPackages.cytoolz: 0.8.0 -> 0.8.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c1feea1b6a9..62c0733e4f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4410,11 +4410,11 @@ in { cytoolz = buildPythonPackage rec { name = "cytoolz-${version}"; - version = "0.8.0"; + version = "0.8.2"; src = pkgs.fetchurl{ url = "mirror://pypi/c/cytoolz/cytoolz-${version}.tar.gz"; - sha256 = "2239890c8fe2da3eba82947c6a68cfa406e5a5045911c9ab3de8113462372629"; + sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; }; # Extension types From 9e4271551ed368eb70b295cc14d89c23946d82f0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:40:31 +0100 Subject: [PATCH 05/24] pythonPackages.entrypoints: 0.2.1 -> 0.2.2 --- pkgs/top-level/python-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62c0733e4f3..8f928332de3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6655,13 +6655,14 @@ in { }); entrypoints = buildPythonPackage rec { - name = "entrypoints"; - version = "0.2.1"; + pname = "entrypoints"; + version = "0.2.2"; + name = "${pname}-${version}"; format = "wheel"; - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/a5/2d/26548d66d58f7775cb332fcf3f864987c05f5e3f800b0b22b9919dacf653/entrypoints-0.2.1-py2.py3-none-any.whl"; - sha256 = "112n36dllmls19j5k6bwcnsm6y2789lxzkjl1n9yir7gkm0dmzzw"; + src = fetchpypi { + inherit pname version format; + sha256 = "0a0685962ee5ac303f470acbb659f0f97aef5b9deb6b85d059691c706ef6e45e"; }; propagatedBuildInputs = with self; [ configparser ]; From 27d4cd47e3565f4ff11f0067bd0ebb8b5a3fba61 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:40:49 +0100 Subject: [PATCH 06/24] pythonPackages.ipykernel: 4.5.1 -> 4.5.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f928332de3..3437798cf0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12966,12 +12966,12 @@ in { }; ipykernel = buildPythonPackage rec { - version = "4.5.1"; + version = "4.5.2"; name = "ipykernel-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipykernel/${name}.tar.gz"; - sha256 = "520c855c6652651c6796a3dd8bc89d533023ac65c5ccf812908187d6f0e461da"; + sha256 = "5a54f25f0e6c8ee74c362c23f9a95e10e74c6b7f5ef42059c861ff6f26d89462"; }; buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; From f677eb6bae5955963e78b555ca964b83838024cf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:41:57 +0100 Subject: [PATCH 07/24] pythonPackages.ipyparallel: 5.2.0 -> 6.0.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3437798cf0e..d2b3cb83f38 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12996,17 +12996,17 @@ in { }; ipyparallel = buildPythonPackage rec { - version = "5.2.0"; + version = "6.0.0"; name = "ipyparallel-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipyparallel/${name}.tar.gz"; - sha256 = "d99e760f1a136b1c402755a4ab51a8d7cb87c892cccadf641948a5e886c8a455"; + sha256 = "9bb5032e98a8c73ddb3da5fb8eecd93c676a5278b68799ab19257b348a0a27f6"; }; buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado + propagatedBuildInputs = with self; [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado ] ++ optionals (!isPy3k) [ futures ]; # Requires access to cluster From 2a6901dc28d36454b3b124cc85f5c3166b823368 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:42:10 +0100 Subject: [PATCH 08/24] pythonPackages.ipython: 5.2.0 -> 5.2.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2b3cb83f38..e8ac9dfebf6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13022,12 +13022,12 @@ in { }; ipython = buildPythonPackage rec { - version = "5.1.0"; + version = "5.2.1"; name = "ipython-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipython/${name}.tar.gz"; - sha256 = "7ef4694e1345913182126b219aaa4a0047e191af414256da6772cf249571b961"; + sha256 = "04dafc37c8876e10e797264302e4333dbcd2854ef6d16bb57cc12ce26515bfdb"; }; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' From f3d91ee84ae6a37cc180ea5bafaa4894c8971002 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:42:31 +0100 Subject: [PATCH 09/24] pythonPackages.jinja2: 2.8 -> 2.9.5 --- pkgs/top-level/python-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e8ac9dfebf6..94226cf310e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13298,11 +13298,13 @@ in { }; jinja2 = buildPythonPackage rec { - name = "Jinja2-2.8"; + pname = "Jinja2"; + version = "2.9.5"; + name = "${pname}-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; - sha256 = "1x0v41lp5m1pjix3l46zx02b7lqp2hflgpnxwkywxynvi3zz47xw"; + sha256 = "702a24d992f856fa8d5a7a36db6128198d0c21e1da34448ca236c42e92384825"; }; propagatedBuildInputs = with self; [ markupsafe ]; From c39c463e7aae54eee1ac64398866e1182157f87a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:42:46 +0100 Subject: [PATCH 10/24] pythonPackages.jupyter_core: 4.2.0 -> 4.2.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94226cf310e..355c0bff84a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13416,12 +13416,12 @@ in { }; jupyter_core = buildPythonPackage rec { - version = "4.2.0"; + version = "4.2.1"; name = "jupyter_core-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/j/jupyter_core/${name}.tar.gz"; - sha256 = "44ec837a53bebf4e937112d3f9ccf31fee4f8db3e406dd0dd4f0378a354bed9c"; + sha256 = "89c55399c8437f777197c2c82c1ff5639c7f71d4eb2f172a81afa120b68dc7b3"; }; buildInputs = with self; [ pytest mock ]; From 8fa286ecc1e8f4aefcd354b77c59966333510e47 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:43:03 +0100 Subject: [PATCH 11/24] pythonPackages.multipledispatch: 0.4.8 -> 0.4.9 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 355c0bff84a..8561d8d0b4b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15021,11 +15021,11 @@ in { multipledispatch = buildPythonPackage rec { name = "multipledispatch-${version}"; - version = "0.4.8"; + version = "0.4.9"; src = pkgs.fetchurl { url = "mirror://pypi/m/multipledispatch/${name}.tar.gz"; - sha256 = "07d41fb3ed25e8424536e48a8566f88a0f9926ca4b6174bff6aa16c98251b92e"; + sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; }; meta = { From 286a7eb59b4a9b8557bcf5e258d80cd75bd5bfc2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:43:20 +0100 Subject: [PATCH 12/24] pythonPackages.nbconvert: 4.2.0 -> 5.1.1 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8561d8d0b4b..892ddf17c57 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15481,17 +15481,17 @@ in { }; nbconvert = buildPythonPackage rec { - version = "4.2.0"; + version = "5.1.1"; name = "nbconvert-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/nbconvert/${name}.tar.gz"; - sha256 = "1ik3k1s8dnqcc6hcrzi1wwy6f5kxfz8rnyahvpy984kl49snv52m"; + sha256 = "847731bc39829d0eb1e15a450ac98c71730e3598e53683d4d76a3f3b3fc5017d"; }; buildInputs = with self; [nose ipykernel ]; - propagatedBuildInputs = with self; [ entrypoints mistune jinja2 pygments traitlets jupyter_core nbformat ipykernel tornado jupyter_client]; + propagatedBuildInputs = with self; [ entrypoints bleach mistune jinja2 pygments traitlets testpath jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client]; checkPhase = '' nosetests -v From ac5df23fcf4af6c52c5dd24a37488f9b1cf00023 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:43:36 +0100 Subject: [PATCH 13/24] pythonPackages.nbformat: 4.0.1 -> 4.2.0 --- pkgs/top-level/python-packages.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 892ddf17c57..e031b90f67c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15509,16 +15509,19 @@ in { }; nbformat = buildPythonPackage rec { - version = "4.0.1"; + version = "4.2.0"; name = "nbformat-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/nbformat/${name}.tar.gz"; - sha256 = "5261c957589b9dfcd387c338d59375162ba9ca82c69e378961a1f4e641285db5"; + sha256 = "389a5b630a30539074f238a48fb9864592f63d611baccfa2ffaf14ffe239de06"; }; + LC_ALL="en_US.UTF-8"; + buildInputs = with self; [ pytest pkgs.glibcLocales ]; + propagatedBuildInputs = with self; [ipython_genutils traitlets testpath jsonschema jupyter_core]; - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ipython_genutils traitlets jsonschema jupyter_core]; + # Failing tests and permission issues + doCheck = false; meta = { description = "The Jupyter Notebook format"; From 68bb54a89b71a378f940f8a12a1ee22cd219078e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:43:49 +0100 Subject: [PATCH 14/24] pythonPackages.nose-exclude: 0.4.1 -> 0.5.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e031b90f67c..69df6665051 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15837,11 +15837,11 @@ in { nose-exclude = buildPythonPackage rec { name = "nose-exclude-${version}"; - version = "0.4.1"; + version = "0.5.0"; src = pkgs.fetchurl { url = "mirror://pypi/n/nose-exclude/${name}.tar.gz"; - sha256 = "44466a9bcb56d2e568750f91504d1278c74eabb259a305b06e975b87b51635da"; + sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304"; }; propagatedBuildInputs = with self; [ nose ]; From 4677b6cf84011ca8e61455d6099dfcb6228ead1c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:44:05 +0100 Subject: [PATCH 15/24] pythonPackages.notebook: 4.2.3 -> 4.3.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 69df6665051..551cc044125 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15957,12 +15957,12 @@ in { }; notebook = buildPythonPackage rec { - version = "4.2.3"; + version = "4.3.2"; name = "notebook-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/notebook/${name}.tar.gz"; - sha256 = "39a9603d3fe88b60de2903680c965cf643acf2c16fb2c6bac1d905e1042b5851"; + sha256 = "fc77edf4ec295542172aa66a3e9d527e75038fcaadd3ed20afbf8596e5629aa9"; }; LC_ALL = "en_US.UTF-8"; From a75aa2cddb662c1c66c06ea7572ca6d450dd4ff5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:44:20 +0100 Subject: [PATCH 16/24] pythonPackages.bottleneck: 1.0.0 -> 1.2.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 551cc044125..09c87ea9185 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18021,10 +18021,10 @@ in { bottleneck = buildPythonPackage rec { name = "Bottleneck-${version}"; - version = "1.0.0"; + version = "1.2.0"; src = pkgs.fetchurl { url = "mirror://pypi/B/Bottleneck/Bottleneck-${version}.tar.gz"; - sha256 = "15dl0ll5xmfzj2fsvajzwxsb9dbw5i9fx9i4r6n4i5nzzba7m6wd"; + sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8"; }; buildInputs = with self; [ nose ]; From 400da715514dea526527b1317e1f62d61f6f8256 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:44:37 +0100 Subject: [PATCH 17/24] pythonPackages.pexpect: 3.3 -> 4.2.1 --- pkgs/top-level/python-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09c87ea9185..845ae6500c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18542,17 +18542,19 @@ in { pexpect = buildPythonPackage rec { - version = "3.3"; + version = "4.2.1"; name = "pexpect-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/p/pexpect/${name}.tar.gz"; - sha256 = "dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba"; + sha256 = "3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92"; }; - # Wants to run python in a subprocess + # Wants to run pythonin a subprocess doCheck = false; + propagatedBuildInputs = with self; [ ptyprocess ]; + meta = { homepage = http://www.noah.org/wiki/Pexpect; description = "Automate interactive console applications such as ssh, ftp, etc"; From cd7e95ac9a1a0b6013930a65db595f899e2e3bce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:44:54 +0100 Subject: [PATCH 18/24] pythonPackages.requests2: 2.11.1 -> 2.13.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 845ae6500c0..41a33fdb9df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22112,11 +22112,11 @@ in { requests2 = buildPythonPackage rec { name = "requests-${version}"; - version = "2.11.1"; + version = "2.13.0"; src = pkgs.fetchurl { url = "mirror://pypi/r/requests/${name}.tar.gz"; - sha256 = "5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133"; + sha256 = "5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8"; }; nativeBuildInputs = [ self.pytest ]; From 4188e6cbf6c63d1612203898a24bbff02f6b52e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:45:08 +0100 Subject: [PATCH 19/24] pythonPackages.tabulate: 0.7.5 -> 0.7.7 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41a33fdb9df..0f79045c007 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25267,12 +25267,12 @@ in { }; tabulate = buildPythonPackage rec { - version = "0.7.5"; + version = "0.7.7"; name = "tabulate-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/t/tabulate/${name}.tar.gz"; - sha256 = "9071aacbd97a9a915096c1aaf0dc684ac2672904cd876db5904085d6dac9810e"; + sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; }; buildInputs = with self; [ nose ]; From 9f740122502d5ac9e01c1cf7a9a70ddc8c13b808 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:45:44 +0100 Subject: [PATCH 20/24] pythonPackages.testpath: init at 0.3 --- pkgs/top-level/python-packages.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f79045c007..81f2bd4b019 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25505,6 +25505,35 @@ in { }; }; + testpath = buildPythonPackage rec { + pname = "testpath"; + version = "0.3"; + name = "${pname}-${version}"; + + #format = "flit"; + #src = pkgs.fetchFromGitHub { + # owner = "jupyter"; + # repo = pname; + # rev = "${version}"; + # sha256 = "1ghzmkrsrk9xrj42pjsq5gl7v3g2v0ji0xy0xzzxp5aizd3wrvl9"; + #}; + #doCheck = true; + #checkPhase = '' + # ${python.interpreter} -m unittest discover + #''; + format = "wheel"; + src = fetchpypi { + inherit pname version format; + sha256 = "f16b2cb3b03e1ada4fb0200b265a4446f92f3ba4b9d88ace34f51c54ab6d294e"; + }; + + meta = { + description = "Test utilities for code working with files and commands"; + license = with lib.licenses; [ mit ]; + homepage = https://github.com/jupyter/testpath; + }; + }; + testrepository = buildPythonPackage rec { name = "testrepository-${version}"; version = "0.0.20"; From 2d062241eaff167935ce149021f774b9becf5fe1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:46:00 +0100 Subject: [PATCH 21/24] pythonPackages.xarray: 0.8.2 -> 0.9.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81f2bd4b019..9db1ffc0d7f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27055,11 +27055,11 @@ EOF xarray = buildPythonPackage rec { name = "xarray-${version}"; - version = "0.8.2"; + version = "0.9.1"; src = pkgs.fetchurl { url = "mirror://pypi/x/xarray/${name}.tar.gz"; - sha256 = "4da06e38baea65c51347ba0770db416ebf003dbad5637215d2b25b191f2be1fb"; + sha256 = "89772ed0e23f0e71c3fb8323746374999ecbe79c113e3fadc7ae6374e6dc0525"; }; buildInputs = with self; [ pytest ]; From 5cd9e1c8f2ca5497e24379b74497efcdd1a6414c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:46:26 +0100 Subject: [PATCH 22/24] pythonPackages.pandocfilters: 1.3.0 -> 1.4.1 --- pkgs/top-level/python-packages.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9db1ffc0d7f..912f65c55b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30898,18 +30898,16 @@ EOF }; }; pandocfilters = buildPythonPackage rec{ - version = "1.3.0"; + version = "1.4.1"; pname = "pandocfilters"; name = pname + "-${version}"; - src = pkgs.fetchFromGitHub { - owner = "jgm"; - repo = pname; - rev = version; - sha256 = "0ky9k800ixwiwvra0na6d6qaqcyps83mycgd8qvkrn5r80hddkzz"; + src = fetchpypi{ + inherit pname version; + sha256 = "ec8bcd100d081db092c57f93462b1861bcfa1286ef126f34da5cb1d969538acd"; }; - - propagatedBuildInputs = with self; [ ]; + # No tests available + doCheck = false; meta = { description = "A python module for writing pandoc filters, with a collection of examples"; From 3eadbb746c7b94b74cdf70e84d2a951458b6d17f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:47:15 +0100 Subject: [PATCH 23/24] pythonPackages.numexpr: 2.6.1 -> 2.6.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 912f65c55b0..6e17ec53649 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16097,12 +16097,12 @@ in { numba = callPackage ../development/python-modules/numba { }; numexpr = buildPythonPackage rec { - version = "2.6.1"; + version = "2.6.2"; name = "numexpr-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/numexpr/${name}.tar.gz"; - sha256 = "db2ee72f277b23c82d204189290ea4b792f9bd5b9d67744b045f8c2a8e929a06"; + sha256 = "6ab8ff5c19e7f452966bf5a3220b845cf3244fe0b96544f7f9acedcc2db5c705"; }; propagatedBuildInputs = with self; [ numpy ]; From fae20e6c2938d2225ca7542ec40278780e5dc93e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:47:38 +0100 Subject: [PATCH 24/24] pythonPackages.ipywidgets: disable tests --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e17ec53649..4980a29dd2a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13090,6 +13090,9 @@ in { sha256 = "baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2"; }; + # Tests are not distributed + doCheck = false; + buildInputs = with self; [ nose pytest ]; propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook widgetsnbextension ];