From 6b0d85273ff2cbce299cdff07fecbd8876d5174b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 21 Jan 2019 17:42:32 +0100 Subject: [PATCH 1/8] python.pkgs.fudge_9: remove It is not used anywhere. --- pkgs/top-level/python-packages.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c8d6393db19d..335867ecb326 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1738,16 +1738,6 @@ in { fudge = callPackage ../development/python-modules/fudge { }; - fudge_9 = self.fudge.overridePythonAttrs (old: rec { - version = "0.9.6"; - - src = fetchPypi { - pname = "fudge"; - inherit version; - sha256 = "34690c4692e8717f4d6a2ab7d841070c93c8d0ea0d2615b47064e291f750b1a0"; - }; - }); - funcparserlib = callPackage ../development/python-modules/funcparserlib { }; fastcache = callPackage ../development/python-modules/fastcache { }; From a3fb6d2590ccbacbd2ff1a203d098566c1f3819e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 21 Jan 2019 17:45:58 +0100 Subject: [PATCH 2/8] python.pkgs.requests2: remove It has been deprecated in ef4442e827af, i.e. for way over a year. --- pkgs/top-level/python-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 335867ecb326..eb6a59d0405e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3834,9 +3834,6 @@ in { reportlab = callPackage ../development/python-modules/reportlab { }; - requests2 = throw "requests2 has been deprecated. Use requests instead."; - - # use requests, not requests_2 requests = callPackage ../development/python-modules/requests { }; requests_download = callPackage ../development/python-modules/requests_download { }; From 2dc2a8e54e6a387a8570b07daadbe44ff3000cfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 21 Jan 2019 17:52:00 +0100 Subject: [PATCH 3/8] mopidy-gmusic: use default cachetools version --- pkgs/applications/audio/mopidy/gmusic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix index 5566c4b07b21..8c173140efd8 100644 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { mopidy pythonPackages.requests pythonPackages.gmusicapi - pythonPackages.cachetools_1 + pythonPackages.cachetools ]; doCheck = false; From 862e16117c1d8d6b6ed35c55a8665074c7cd1669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 21 Jan 2019 17:54:31 +0100 Subject: [PATCH 4/8] python.pkgs.cachetools_1: remove It is not used anywhere and was pointing to version 2.1.0 anyway. --- .../development/python-modules/cachetools/1.nix | 17 ----------------- pkgs/top-level/python-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 pkgs/development/python-modules/cachetools/1.nix 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; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb6a59d0405e..8569ba25b77a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3305,8 +3305,7 @@ in { rfc3986 = callPackage ../development/python-modules/rfc3986 { }; - cachetools_1 = callPackage ../development/python-modules/cachetools/1.nix {}; - cachetools = callPackage ../development/python-modules/cachetools {}; + cachetools = callPackage ../development/python-modules/cachetools {}; cmd2_8 = callPackage ../development/python-modules/cmd2/old.nix {}; cmd2_9 = callPackage ../development/python-modules/cmd2 {}; From 1af54579a25693b25a8b7827564bd9d85fa82745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 21 Jan 2019 17:58:10 +0100 Subject: [PATCH 5/8] python.pkgs.udiskie: remove --- pkgs/top-level/python-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8569ba25b77a..80f7b5df8a71 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4666,9 +4666,6 @@ in { power = callPackage ../development/python-modules/power { }; - # added 2018-05-23, can be removed once 18.09 is branched off - udiskie = throw "pythonPackages.udiskie has been replaced by udiskie"; - pythonefl = callPackage ../development/python-modules/python-efl { }; tlsh = callPackage ../development/python-modules/tlsh { }; From b80269887320347240fbea980965d589da5f6c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 21 Jan 2019 18:00:06 +0100 Subject: [PATCH 6/8] python.pkgs.pandas_0_17_1: remove It is not used anywhere. --- .../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 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 { }; From a27e54848e1f2990f5d3830ac97321dd934d0c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 21 Jan 2019 18:02:56 +0100 Subject: [PATCH 7/8] python.pkgs.bugwarrior: use default future version --- pkgs/development/python-modules/bugwarrior/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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. From 9cc49fd05d965189836ee915e8f6c5754d742df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 21 Jan 2019 18:03:39 +0100 Subject: [PATCH 8/8] python.pkgs.future15: remove It is not used anymore. --- pkgs/top-level/python-packages.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58ce6330ede2..e10719887f30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2507,15 +2507,6 @@ in { fusepy = callPackage ../development/python-modules/fusepy { }; future = callPackage ../development/python-modules/future { }; - future15 = self.future.overridePythonAttrs (old: rec { - name = "future-${version}"; - version = "0.15.2"; - src = fetchPypi { - pname = "future"; - version = "0.15.2"; - sha256 = "15wvcfzssc68xqnqi1dq4fhd0848hwi9jn42hxyvlqna40zijfrx"; - }; - }); futures = callPackage ../development/python-modules/futures { };