From 862e16117c1d8d6b6ed35c55a8665074c7cd1669 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Mon, 21 Jan 2019 17:54:31 +0100 Subject: python.pkgs.cachetools_1: remove It is not used anywhere and was pointing to version 2.1.0 anyway. --- pkgs/development/python-modules/cachetools/1.nix | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 pkgs/development/python-modules/cachetools/1.nix (limited to 'pkgs/development/python-modules') diff --git a/pkgs/development/python-modules/cachetools/1.nix b/pkgs/development/python-modules/cachetools/1.nix deleted file mode 100644 index 05f3afe758a6..000000000000 --- a/pkgs/development/python-modules/cachetools/1.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy }: - -buildPythonPackage rec { - pname = "cachetools"; - version = "2.1.0"; - disabled = isPyPy; # a test fails - - src = fetchPypi { - inherit pname version; - sha256 = "90f1d559512fc073483fe573ef5ceb39bf6ad3d39edc98dc55178a2b2b176fa3"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/tkem/cachetools"; - license = licenses.mit; - }; -} -- cgit 1.4.1 From b80269887320347240fbea980965d589da5f6c8b Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Mon, 21 Jan 2019 18:00:06 +0100 Subject: python.pkgs.pandas_0_17_1: remove It is not used anywhere. --- pkgs/development/python-modules/pandas/0.17.1.nix | 76 ----------------------- pkgs/top-level/python-packages.nix | 2 - 2 files changed, 78 deletions(-) delete mode 100644 pkgs/development/python-modules/pandas/0.17.1.nix (limited to 'pkgs/development/python-modules') diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix deleted file mode 100644 index c481aa0dfea7..000000000000 --- a/pkgs/development/python-modules/pandas/0.17.1.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, stdenv -, pytest -, glibcLocales -, cython -, dateutil -, scipy -, numexpr -, pytz -, xlrd -, bottleneck -, sqlalchemy -, lxml -, html5lib -, beautifulsoup4 -, openpyxl -, tables -, xlwt -, libcxx ? null -}: - -let - inherit (stdenv.lib) optional optionalString; - inherit (stdenv) isDarwin; -in buildPythonPackage rec { - pname = "pandas"; - version = "0.17.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837"; - }; - - LC_ALL = "en_US.UTF-8"; - buildInputs = [ pytest glibcLocales ] ++ optional isDarwin libcxx; - propagatedBuildInputs = [ - cython - dateutil - scipy - numexpr - pytz - xlrd - bottleneck - sqlalchemy - lxml - html5lib - beautifulsoup4 - openpyxl - tables - xlwt - ]; - - doCheck = false; - - # For OSX, we need to add a dependency on libcxx, which provides - # `complex.h` and other libraries that pandas depends on to build. - postPatch = optionalString isDarwin '' - cpp_sdk="${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']" - ''; - - meta = { - # https://github.com/pandas-dev/pandas/issues/14866 - # pandas devs are no longer testing i686 so safer to assume it's broken - broken = stdenv.isi686; - homepage = http://pandas.pydata.org/; - description = "Python Data Analysis Library"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ shlevy ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80f7b5df8a71..58ce6330ede2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3357,8 +3357,6 @@ in { pandas = callPackage ../development/python-modules/pandas { }; - pandas_0_17_1 = callPackage ../development/python-modules/pandas/0.17.1.nix { }; - xlrd = callPackage ../development/python-modules/xlrd { }; bottleneck = callPackage ../development/python-modules/bottleneck { }; -- cgit 1.4.1 From a27e54848e1f2990f5d3830ac97321dd934d0c1f Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Mon, 21 Jan 2019 18:02:56 +0100 Subject: python.pkgs.bugwarrior: use default future version --- pkgs/development/python-modules/bugwarrior/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/python-modules') diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index 844aebbbb965..b2b10671f2b9 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi , mock, unittest2, nose , twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six -, jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future15 }: +, jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future }: buildPythonPackage rec { pname = "bugwarrior"; @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ mock unittest2 nose /* jira megaplan */ ]; propagatedBuildInputs = [ twiggy requests offtrac bugzilla taskw dateutil pytz keyring six - jinja2 pycurl dogpile_cache lockfile click pyxdg future15 + jinja2 pycurl dogpile_cache lockfile click pyxdg future ]; # for the moment jira>=0.22 and megaplan>=1.4 are missing for running the test suite. -- cgit 1.4.1