Merge pull request #64277 from jonringer/update-praw

pythonPackages.praw: 6.0.0 -> 6.3.1

pkgs/development/python-modules/praw/default.nix

@@ -1,47 +1,53 @@
 { stdenv, buildPythonPackage, fetchFromGitHub
-, requests, decorator, flake8, mock, six, update_checker, pytestrunner, prawcore
-, pytest_3, betamax, betamax-serializers, betamax-matchers, requests_toolbelt
+, betamax
+, betamax-serializers
+, betamax-matchers
+, mock
+, six
+, pytestrunner
+, prawcore
+, pytest
+, requests-toolbelt
+, update_checker
+, websocket_client
 }:
 
 buildPythonPackage rec {
   pname = "praw";
-  version = "6.0.0";
+  version = "6.3.1";
 
   src = fetchFromGitHub {
     owner = "praw-dev";
     repo = "praw";
     rev = "v${version}";
-    sha256 = "0y6nyz8vf98gl1qfmnznv3dbvlbzdl6mz99vk673nyfn3hbs451i";
+    sha256 = "0by89aw7m803dvjcc33m9390msjm6v5v8g3k8ink9gfm421lw8ky";
   };
 
-  postPatch = ''
-    # drop upper bound of prawcore requirement
-    sed -ri "s/'(prawcore >=.+), <.+'/'\1'/" setup.py
-  '';
+  nativeBuildInputs = [
+    pytestrunner
+  ];
 
   propagatedBuildInputs = [
-    requests
-    decorator
-    flake8
     mock
-    six
-    update_checker
-    pytestrunner
     prawcore
+    update_checker
+    websocket_client
   ];
 
   checkInputs = [
-    pytest_3
     betamax
     betamax-serializers
     betamax-matchers
-    requests_toolbelt
+    mock
+    pytest
+    requests-toolbelt
+    six
   ];
 
   meta = with stdenv.lib; {
     description = "Python Reddit API wrapper";
-    homepage = https://praw.readthedocs.org/;
-    license = licenses.gpl3;
+    homepage = "https://praw.readthedocs.org/";
+    license = licenses.bsd2;
     platforms = platforms.all;
     maintainers = with maintainers; [ ];
   };

pkgs/development/python-modules/websocket_client/default.nix

@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, isPy27
+, six
+, backports_ssl_match_hostname
+}:
+
+buildPythonPackage rec {
+  version = "0.56.0";
+  pname = "websocket_client";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z";
+  };
+
+  propagatedBuildInputs = [
+    six
+  ] ++ lib.optional isPy27 backports_ssl_match_hostname;
+
+  meta = with lib; {
+    description = "Websocket client for python";
+    homepage = "https://github.com/websocket-client/websocket-client";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
+  };
+}

pkgs/development/python-modules/websockets_client/default.nix

@@ -1,24 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, six }:
-buildPythonPackage rec {
-  pname = "websocket_client";
-  version = "0.54.0";
-
-  src = fetchPypi {
-    inherit version pname;
-    sha256 = "e51562c91ddb8148e791f0155fdb01325d99bb52c4cdbb291aee7a3563fd0849";
-  };
-
-  prePatch = ''
-    # ssl.match_hostname exists in python2.7 version maintained in nixpkgs,
-    # the dependency is not necessary.
-    sed -e "s/\['backports.ssl_match_hostname'\]/\[\]/" -i setup.py
-  '';
-
-  propagatedBuildInputs = [ six ];
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/liris/websocket-client;
-    description = "Websocket client for python";
-    license = licenses.lgpl2;
-  };
-}

pkgs/top-level/python-packages.nix

@@ -5091,7 +5091,7 @@ in {
 
   larch = callPackage ../development/python-modules/larch { };
 
-  websocket_client = callPackage ../development/python-modules/websockets_client { };
+  websocket_client = callPackage ../development/python-modules/websocket_client { };
 
   webhelpers = callPackage ../development/python-modules/webhelpers { };