Merge pull request #54432 from dotlambda/python-pkgs-remove

pythonPackages: remove some packages representing outdated versions

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;

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.

pkgs/development/python-modules/cachetools/1.nix

@@ -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;
-  };
-}

pkgs/development/python-modules/pandas/0.17.1.nix

@@ -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;
-  };
-}

pkgs/top-level/python-packages.nix

@@ -1742,16 +1742,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 { };
@@ -2521,15 +2511,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 { };
 
@@ -3319,8 +3300,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 {};
@@ -3372,8 +3352,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 { };
@@ -3848,9 +3826,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 { };
@@ -4684,9 +4659,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 { };