From f7f149035e347f275888a7c726ef9ccb993e905d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Mar 2016 19:01:09 -0500 Subject: [PATCH 1/9] pythonPackages.jupyter_console: 4.1.0 -> 4.1.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 ade98083aa3..57e9436263d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6250,12 +6250,12 @@ in modules // { }; jupyter_console = buildPythonPackage rec { - version = "4.1.0"; + version = "4.1.1"; name = "jupyter_console-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jupyter_console/${name}.tar.gz"; - sha256 = "3f9703b632e38d68713fc2ea1f546edc4db2a8f925c94b6dd91a8d0c13816ce9"; + sha256 = "1qsa9h7db8qzd4hg9l5mfl8299y4i7jkd6p3vpksk3r5ip8wym6p"; }; buildInputs = with self; [ nose ]; From 2de0f6e9659f91d78e23d3fdcc4e4129869da6a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Mar 2016 19:01:22 -0500 Subject: [PATCH 2/9] pythonPackages.ipython: 4.0.3 -> 4.1.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 57e9436263d..662291542ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10327,12 +10327,12 @@ in modules // { }; ipython = buildPythonPackage rec { - version = "4.0.3"; + version = "4.1.2"; name = "ipython-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; - sha256 = "3a928f59e8ac8dd97858c28390867c87c09510f1f8bbe97e4e9c6b036eb84fc0"; + sha256 = "14hnf3m087z39ndn5irj1ficc6l197bmdj6fpvz8bwi7la99cbq5"; }; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' From c0114b3f63373315eddf6e1b252d4676bcacb840 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Mar 2016 19:01:35 -0500 Subject: [PATCH 3/9] pythonPackages.openpyxl: 2.3.0 -> 2.3.3 --- pkgs/top-level/python-packages.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 662291542ae..7d964845d86 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13177,17 +13177,20 @@ in modules // { }; openpyxl = buildPythonPackage rec { - version = "2.3.0"; + version = "2.3.3"; name = "openpyxl-${version}"; - src = pkgs.fetchhg { - url = "https://bitbucket.org/openpyxl/openpyxl"; - rev = "${version}"; - sha256 = "1iisk6rfh9h5xb411kfyzkcab6fdnsx573i0d83wfn4csk4p3p4d"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/o/openpyxl/${name}.tar.gz"; + sha256 = "1zigyvsq45izkhr1h5gisgi0ag5dm6kz09f01c2cgdfav1bl3mlk"; }; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ jdcal et_xmlfile ]; + propagatedBuildInputs = with self; [ jdcal et_xmlfile lxml ]; + + # Tests are not included in archive. + # https://bitbucket.org/openpyxl/openpyxl/issues/610 + doCheck = false; meta = { description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; From 896f5372be18a91b5a68020218c66702ddc6c7b1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Mar 2016 19:01:51 -0500 Subject: [PATCH 4/9] pythonPackages.xlwt: init at 1.0.0 --- 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 7d964845d86..363e98e42ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22247,6 +22247,27 @@ in modules // { }; }; + xlwt = buildPythonPackage rec { + name = "xlwt-${version}"; + version = "1.0.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/x/xlwt/${name}.tar.gz"; + sha256 = "1y8w5imsicp01gn749qhw6j0grh9y19zz57ribwaknn8xqwjjhxc"; + }; + + buildInputs = with self; [ nose ]; + checkPhase = '' + nosetests -v + ''; + + meta = { + description = "Library to create spreadsheet files compatible with MS"; + homepage = https://github.com/python-excel/xlwt; + license = with licenses; [ bsdOriginal bsd3 lgpl21 ]; + }; + }; + youtube-dl = callPackage ../tools/misc/youtube-dl { # Release versions don't need pandoc because the formatted man page # is included in the tarball. From f2d2d515ee1b929b85a6f8ea2cf0daf6bd7c1097 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Mar 2016 19:02:08 -0500 Subject: [PATCH 5/9] pythonPackages.xlrd: fix test runner --- pkgs/top-level/python-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 363e98e42ce..ec6458ab59f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14647,11 +14647,18 @@ in modules // { xlrd = buildPythonPackage rec { name = "xlrd-${version}"; + version = "0.9.4"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-${version}.tar.gz"; sha256 = "8e8d3359f39541a6ff937f4030db54864836a06e42988c452db5b6b86d29ea72"; }; + + buildInputs = with self; [ nose ]; + checkPhase = '' + nosetests -v + ''; + }; bottleneck = buildPythonPackage rec { From 8585441ae5266c7b428d68e301cf677545da4eb9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Mar 2016 19:02:58 -0500 Subject: [PATCH 6/9] pythonPackages.pandas_18: init at 0.18.0 --- pkgs/top-level/python-packages.nix | 73 ++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec6458ab59f..9b330d8c820 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14645,6 +14645,79 @@ in modules // { }; }; + pandas_18 = let + inherit (pkgs.stdenv.lib) optional optionalString; + inherit (pkgs.stdenv) isDarwin; + in buildPythonPackage rec { + name = "pandas-${version}"; + version = "0.18.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz"; + sha256 = "050qw0ap5bhyv5flp78x3lcq1dlminl3xaj6kbrm0jqmx0672xf9"; + }; + + + LC_ALL = "en_US.UTF-8"; + buildInputs = with self; [ nose pkgs.glibcLocales ] ++ optional isDarwin pkgs.libcxx; + propagatedBuildInputs = with self; [ + dateutil + scipy + numexpr + pytz + xlrd + bottleneck + sqlalchemy + lxml + html5lib + modules.sqlite3 + beautifulsoup4 + openpyxl + xlwt + ] ++ optional isDarwin pkgs.darwin.locale; # provides the locale command + + # For OSX, we need to add a dependency on libcxx, which provides + # `complex.h` and other libraries that pandas depends on to build. + patchPhase = optionalString isDarwin '' + cpp_sdk="${pkgs.libcxx}/include/c++/v1"; + echo "Adding $cpp_sdk to the setup.py common_include variable" + substituteInPlace setup.py \ + --replace "['pandas/src/klib', 'pandas/src']" \ + "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" + + # disable clipboard tests since pbcopy/pbpaste are not open source + substituteInPlace pandas/io/tests/test_clipboard.py \ + --replace pandas.util.clipboard no_such_module \ + --replace OSError ImportError + ''; + + # The flag `-A 'not network'` will disable tests that use internet. + # The `-e` flag disables a few problematic tests. + # https://github.com/pydata/pandas/issues/11169 + # https://github.com/pydata/pandas/issues/11287 + # The test_sql checks fail specifically on python 3.5; see here: + # https://github.com/pydata/pandas/issues/11112 + checkPhase = let + testsToSkip = []; + in '' + runHook preCheck + # The flag `-A 'not network'` will disable tests that use internet. + # The `-e` flag disables a few problematic tests. + ${python.executable} setup.py nosetests -A 'not slow and not network' \ + --verbosity=3 + + runHook postCheck + ''; + + meta = { + homepage = "http://pandas.pydata.org/"; + description = "Python Data Analysis Library"; + license = licenses.bsd3; + maintainers = with maintainers; [ raskin fridh ]; + platforms = platforms.unix; + }; + }; + xlrd = buildPythonPackage rec { name = "xlrd-${version}"; From efd6e1884cc49d2a91d6e52880bdf651cfc431a0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Mar 2016 19:04:40 -0500 Subject: [PATCH 7/9] pythonPackages.pandas_17: init at 0.17.1 --- pkgs/top-level/python-packages.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b330d8c820..bdb170b7116 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14570,7 +14570,7 @@ in modules // { }; }; - pandas = let + pandas_17 = let inherit (pkgs.stdenv.lib) optional optionalString; inherit (pkgs.stdenv) isDarwin; in buildPythonPackage rec { @@ -14585,16 +14585,14 @@ in modules // { buildInputs = with self; [ nose ] ++ optional isDarwin pkgs.libcxx; propagatedBuildInputs = with self; [ dateutil - numpy - scipy + scipy_0_17 numexpr pytz xlrd bottleneck sqlalchemy lxml - # Disabling this because an upstream dependency, pep8, is broken on v3.5. - (if isPy35 then null else html5lib) + html5lib modules.sqlite3 beautifulsoup4 ] ++ optional isDarwin pkgs.darwin.locale; # provides the locale command @@ -14630,7 +14628,7 @@ in modules // { runHook preCheck # The flag `-A 'not network'` will disable tests that use internet. # The `-e` flag disables a few problematic tests. - ${python.executable} setup.py nosetests -A 'not network' --stop \ + ${python.executable} setup.py nosetests -A 'not slow and not network' --stop \ -e '${concatStringsSep "|" testsToSkip}' --verbosity=3 runHook postCheck From 700c8dc6d04e84a159c70d5a4535befb2ce46fd9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Mar 2016 19:05:00 -0500 Subject: [PATCH 8/9] pythonPackages.pandas: 0.17.1 -> 0.18.0 --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdb170b7116..fd582bae347 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14570,6 +14570,8 @@ in modules // { }; }; + pandas = self.pandas_18; + pandas_17 = let inherit (pkgs.stdenv.lib) optional optionalString; inherit (pkgs.stdenv) isDarwin; From cc111028585d049a7d264c2068fe33190e897360 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 13 Mar 2016 09:53:03 -0400 Subject: [PATCH 9/9] pythonPackages.xarray: 0.7.0 -> 0.7.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 fd582bae347..17f0cbf0a2a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22305,11 +22305,11 @@ in modules // { xarray = buildPythonPackage rec { name = "xarray-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/x/xarray/${name}.tar.gz"; - sha256 = "b1562e8e2c61f1c3587d557ff48d2bc7be36574d6a8e86f11186c356bdd794cf"; + sha256 = "1swcpq8x0p5pp94r9j4hr2anz1rqh7fnqax16xn9xsgrikdjipj5"; }; buildInputs = with self; [ pytest ];