Merge pull request #23885 from FRidh/jupyter

Jupyter
2017-03-14 17:32:27 +01:00 · 2017-03-14 17:32:27 +01:00 · a79c653d5d
commit a79c653d5d
parent 6de3eb9918 4a615d90af
3 changed files with 106 additions and 56 deletions
--- a/pkgs/development/python-modules/configparser/0001-namespace-fix.patch
+++ b/pkgs/development/python-modules/configparser/0001-namespace-fix.patch
@ -0,0 +1,42 @@
+From daae1ae35e13bc8107dc97d9219dfb8e172d5d2a Mon Sep 17 00:00:00 2001
+From: Frederik Rietdijk <fridh@fridh.nl>
+Date: Tue, 14 Mar 2017 15:00:33 +0100
+Subject: [PATCH] namespace fix
+
+configparser broke other namespace packages
+https://github.com/NixOS/nixpkgs/issues/23855#issuecomment-286427428
+This patch seems to solve that issue.
+---
+ setup.py                  | 1 -
+ src/backports/__init__.py | 6 ------
+ 2 files changed, 7 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 3b07823..63ed25d 100644
+--- a/setup.py
+++ b/setup.py
+@@ -42,7 +42,6 @@ setup(
+     py_modules=modules,
+     package_dir={'': 'src'},
+     packages=find_packages('src'),
+-    namespace_packages=['backports'],
+     include_package_data=True,
+     zip_safe=False,
+     install_requires=requirements,
+diff --git a/src/backports/__init__.py b/src/backports/__init__.py
+index f84d25c..febdb2f 100644
+--- a/src/backports/__init__.py
+++ b/src/backports/__init__.py
+@@ -3,9 +3,3 @@
+ 
+ from pkgutil import extend_path
+ __path__ = extend_path(__path__, __name__)
+-
+-try:
+-    import pkg_resources
+-    pkg_resources.declare_namespace(__name__)
+-except ImportError:
+-    pass
+-- 
+2.11.1
+
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@ -1,13 +1,16 @@
-{ buildPythonPackage, fetchzip, isPy3k, lib, pythonOlder }:
+{ buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }:
 buildPythonPackage rec {
-  name = "typed-ast-${version}";
-  version = "1.0.1";
-  src = fetchzip {
-    url = "mirror://pypi/t/typed-ast/${name}.zip";
-    sha256 = "1q69czr9ghnbd81hay71kgynn6mqi5nsgand9yw6dyw5bim5l154";
+  pname = "typed-ast";
+  version = "1.0.2";
+  name = "${pname}-${version}";
+  src = fetchPypi{
+    inherit pname version;
+    sha256 = "13e02b10479ddff07eb546f9638743702ab9b175bfa3cdf2482688df91b5766d";
  };
  # Only works with Python 3.3 and newer;
-  disabled = !isPy3k && !(pythonOlder "3.3");
+  disabled = pythonOlder "3.3";
+  # No tests in archive
+  doCheck = false;
  meta = {
    homepage = "https://pypi.python.org/pypi/typed-ast";
    description = "a fork of Python 2 and 3 ast modules with type comment support";
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -4146,6 +4146,12 @@ in {
    # No tests available
    doCheck = false;

+    # Fix issue when used together with other namespace packages
+    # https://github.com/NixOS/nixpkgs/issues/23855
+    patches = [
+      ./../development/python-modules/configparser/0001-namespace-fix.patch
+    ];
+
    meta = {
      maintainers = [ ];
      platforms = platforms.all;
@ -5346,10 +5352,10 @@ in {

  pytest-shutil = buildPythonPackage rec {
    name = "pytest-shutil-${version}";
-    version = "1.1.1";
+    version = "1.2.8";
    src = pkgs.fetchurl {
      url = "mirror://pypi/p/pytest-shutil/${name}.tar.gz";
-      sha256 = "bb3c4fc2dddaf70b38bd9bb7a710d07728fa14f88fbc89c2a07979b383ade5d4";
+      sha256 = "924accaec3f3781416139e580386ab4f849cb8662bc1072405a81d3a5e56bf3d";
    };
    buildInputs = with self; [ cmdline pytest ];
    propagatedBuildInputs = with self; [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 ];
@ -5361,12 +5367,9 @@ in {
      license = licenses.mit;
    };

-
    checkPhase = ''
      py.test
    '';
-    # Bunch of pickle errors
-    doCheck = false;
  };

  pytestcov = buildPythonPackage (rec {
@ -5396,10 +5399,10 @@ in {
  pytest-virtualenv = buildPythonPackage rec {
    name = "${pname}-${version}";
    pname = "pytest-virtualenv";
-    version = "1.1.0";
+    version = "1.2.7";
    src = pkgs.fetchurl {
      url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-      sha256 = "093f5fa479ee6201e48db367c307531dc8b800609b0c3ddca9c01e0fd466a669";
+      sha256 = "51fb6468670624b2315aecaf1a2bbd698509e3ea6a1e28b094984c45e1376755";
    };
    buildInputs = with self; [ pytest pytestcov mock cmdline ];
    propagatedBuildInputs = with self; [ pytest-fixture-config pytest-shutil ];
@ -5953,6 +5956,7 @@ in {
      description = "Date parsing library designed to parse dates from HTML pages";
      homepage = http://pypi.python.org/pypi/dateparser;
      license = licenses.bsd3;
+      broken = true;
    };
  };

@ -10030,6 +10034,11 @@ in {
      substituteInPlace pywatchman/__init__.py \
        --replace "'watchman'" "'${pkgs.watchman}/bin/watchman'"
    '';
+    # SyntaxError
+    disabled = isPy3k;
+    # No tests in archive
+    doCheck = false;
+
  };

  zope_tales = buildPythonPackage rec {
@ -13041,12 +13050,12 @@ in {
  };

  ipython = buildPythonPackage rec {
-    version = "5.2.1";
+    version = "5.3.0";
    name = "ipython-${version}";

    src = pkgs.fetchurl {
      url = "mirror://pypi/i/ipython/${name}.tar.gz";
-      sha256 = "04dafc37c8876e10e797264302e4333dbcd2854ef6d16bb57cc12ce26515bfdb";
+      sha256 = "bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d";
    };

    prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
@ -13076,21 +13085,14 @@ in {
  };

  ipython_genutils = buildPythonPackage rec {
-    version = "0.1.0";
+    version = "0.2.0";
    name = "ipython_genutils-${version}";

    src = pkgs.fetchurl {
      url = "mirror://pypi/i/ipython_genutils/${name}.tar.gz";
-      sha256 = "3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6";
+      sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8";
    };

-    patches = [
-      (pkgs.fetchpatch {
-        url = "https://github.com/ipython/ipython_genutils/commit/6d74d8cb34e49820e48ba8b4f5e5f8322824f4f7.patch";
-        sha256 = "13ah6a11qldzzywax50la6qwq02sk5929gjkzzn456lg1ja5gq35";
-      })
-    ];
-
    LC_ALL = "en_US.UTF-8";
    buildInputs = with self; [ nose pkgs.glibcLocales ];

@ -13418,16 +13420,16 @@ in {
  };

  jupyter_client = buildPythonPackage rec {
-    version = "4.4.0";
+    version = "5.0.0";
    name = "jupyter_client-${version}";

    src = pkgs.fetchurl {
      url = "mirror://pypi/j/jupyter_client/${name}.tar.gz";
-      sha256 = "c99a52fac2e5b7a3b714e9252ebf72cbf97536d556ae2b5082baccc3e5cd52ee";
+      sha256 = "2766f9c2deb9ae826e65d53a56a36d69b184f63d0dcb7710835273327126bc5b";
    };

    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq] ++ optional isPyPy py;
+    propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq dateutil] ++ optional isPyPy py;

    checkPhase = ''
      nosetests -v
@ -13445,12 +13447,12 @@ in {
  };

  jupyter_core = buildPythonPackage rec {
-    version = "4.2.1";
+    version = "4.3.0";
    name = "jupyter_core-${version}";

    src = pkgs.fetchurl {
      url = "mirror://pypi/j/jupyter_core/${name}.tar.gz";
-      sha256 = "89c55399c8437f777197c2c82c1ff5639c7f71d4eb2f172a81afa120b68dc7b3";
+      sha256 = "a96b129e1641425bf057c3d46f4f44adce747a7d60107e8ad771045c36514d40";
    };

    buildInputs = with self; [ pytest mock ];
@ -15291,16 +15293,15 @@ in {
  };

  pygal = buildPythonPackage rec {
-    version = "2.0.10";
-    name = "pygal-${version}";
+    pname = "pygal";
+    version = "2.3.1";
+    name = "${pname}-${version}";

    doCheck = !isPyPy;  # one check fails with pypy

-    src = pkgs.fetchFromGitHub {
-      owner = "Kozea";
-      repo = "pygal";
-      rev = version;
-      sha256 = "1j7qjgraapvfc80yp8xcbddqrw8379gqi7pwkvfml3qcqm0z0d33";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "7ba5a191233d0c2d8bf4b4d26b06e42bd77483a59ba7d3e5b884d81d1a870667";
    };

    buildInputs = with self; [ flask pyquery pytest ];
@ -15557,12 +15558,12 @@ in {
  };

  nbformat = buildPythonPackage rec {
-    version = "4.2.0";
+    version = "4.3.0";
    name = "nbformat-${version}";

    src = pkgs.fetchurl {
      url = "mirror://pypi/n/nbformat/${name}.tar.gz";
-      sha256 = "389a5b630a30539074f238a48fb9864592f63d611baccfa2ffaf14ffe239de06";
+      sha256 = "5febcce872672f1c97569e89323992bdcb8573fdad703f835e6521253191478b";
    };
    LC_ALL="en_US.UTF-8";
    buildInputs = with self; [ pytest pkgs.glibcLocales ];
@ -16005,12 +16006,12 @@ in {
  };

  notebook = buildPythonPackage rec {
-    version = "4.3.2";
+    version = "4.4.1";
    name = "notebook-${version}";

    src = pkgs.fetchurl {
      url = "mirror://pypi/n/notebook/${name}.tar.gz";
-      sha256 = "fc77edf4ec295542172aa66a3e9d527e75038fcaadd3ed20afbf8596e5629aa9";
+      sha256 = "dfadef2babd7c04c6c257df7d07d7ba587e503dbb4e4c95305f9a95b8d3a9765";
    };

    LC_ALL = "en_US.UTF-8";
@ -18152,7 +18153,7 @@ in {

  parsedatetime = buildPythonPackage rec {
    name = "parsedatetime-${version}";
-    version = "2.1";
+    version = "2.3";

    meta = {
      description = "Parse human-readable date/time text";
@ -18160,11 +18161,12 @@ in {
      license = licenses.asl20;
    };

-    buildInputs = with self; [ PyICU nose ];
+    buildInputs = with self; [ pytest pytestrunner ];
+    propagatedBuildInputs = with self; [ future ];

    src = pkgs.fetchurl {
        url = "mirror://pypi/p/parsedatetime/${name}.tar.gz";
-        sha256 = "0bdgyw6y3v7bcxlx0p50s8drxsh5bb5cy2afccqr3j90amvpii8p";
+        sha256 = "1vkrmd398s11h1zn3zaqqsiqhj9lwy1ikcg6irx2lrgjzjg3rjll";
    };
  };

@ -18400,14 +18402,14 @@ in {

  pathlib2 = if !(pythonOlder "3.4") then null else buildPythonPackage rec {
    name = "pathlib2-${version}";
-    version = "2.1.0";
+    version = "2.2.1";

    src = pkgs.fetchurl {
      url = "mirror://pypi/p/pathlib2/${name}.tar.gz";
-      sha256 = "deb3a960c1d55868dfbcac98432358b92ba89d95029cddd4040db1f27405055c";
+      sha256 = "ce9007df617ef6b7bd8a31cd2089ed0c1fed1f7c23cf2bf1ba140b3dd563175d";
    };

-    propagatedBuildInputs = with self; [ six ];
+    propagatedBuildInputs = with self; [ six ] ++ optional (pythonOlder "3.5") scandir;

    meta = {
      description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems.";
@ -18418,12 +18420,12 @@ in {
  };

  pathpy = buildPythonPackage rec {
-    version = "8.1.2";
+    version = "10.1";
    name = "path.py-${version}";

    src = pkgs.fetchurl {
      url = "mirror://pypi/p/path.py/${name}.tar.gz";
-      sha256 = "ada95d117c4559abe64080961daf5badda68561afdd34c278f8ca20f2fa466d2";
+      sha256 = "8b0ee56f6c1421a9038823926ee8da354ce70933424b408558bc6b48496587f3";
    };

    buildInputs = with self; [setuptools_scm pytestrunner pytest pkgs.glibcLocales ];
@ -18770,15 +18772,18 @@ in {
  };

  pickleshare = buildPythonPackage rec {
-    version = "0.5";
+    version = "0.7.4";
    name = "pickleshare-${version}";

    src = pkgs.fetchurl {
      url = "mirror://pypi/p/pickleshare/${name}.tar.gz";
-      sha256 = "c0be5745035d437dbf55a96f60b7712345b12423f7d0951bd7d8dc2141ca9286";
+      sha256 = "84a9257227dfdd6fe1b4be1319096c20eb85ff1e82c7932f36efccfe1b09737b";
    };

-    propagatedBuildInputs = with self; [pathpy];
+    propagatedBuildInputs = with self; [pathpy] ++ optional (pythonOlder "3.4") pathlib2;
+
+    # No proper test suite
+    doCheck = false;

    meta = {
      description = "Tiny 'shelve'-like database with concurrency support";
@ -19270,10 +19275,10 @@ in {

  prompt_toolkit = buildPythonPackage rec {
    name = "prompt_toolkit-${version}";
-    version = "1.0.9";
+    version = "1.0.13";

    src = pkgs.fetchurl {
-      sha256 = "172r15k9kwdw2lnajvpz1632dd16nqz1kcal1p0lq5ywdarj6rfd";
+      sha256 = "33d68ca09f76cd73287fde7df5748ffacf26a8238dd61ee81ac50860ea7c6776";
      url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz";
    };
    checkPhase = ''
@ -28170,10 +28175,10 @@ EOF
  };

  pyzmq = buildPythonPackage rec {
-    name = "pyzmq-15.2.0";
+    name = "pyzmq-16.0.2";
    src = pkgs.fetchurl {
      url = "mirror://pypi/p/pyzmq/${name}.tar.gz";
-      sha256 = "2dafa322670a94e20283aba2a44b92134d425bd326419b68ad4db8d0831a26ec";
+      sha256 = "0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d";
    };
    buildInputs = with self; [ pkgs.zeromq3 pytest tornado ];
    propagatedBuildInputs = [ self.py ];