git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #64277 from jonringer/update-praw

pythonPackages.praw: 6.0.0 -> 6.3.1

commite6b6815b26f3fee47ddd1b237b70cec10f30e588 authorMatthieu Coudron <mattator@gmail.com> dateThu 4 Jul 2019, 15:55 (7 years ago) parente6112009ed3fcc
4 files changed+50−43
pkgs/development/python-modules/praw/default.nix+24−18 pkgs/development/python-modules/websocket_client/default.nix+25 pkgs/development/python-modules/websockets_client/default.nix−24 pkgs/top-level/python-packages.nix+1−1
pkgs/development/python-modules/praw/default.nix+24−18
@@ -1,47 +1,53 @@
11{ stdenv, buildPythonPackage, fetchFromGitHub
2−, requests, decorator, flake8, mock, six, update_checker, pytestrunner, prawcore
3−, pytest_3, betamax, betamax-serializers, betamax-matchers, requests_toolbelt
2+, betamax
3+, betamax-serializers
4+, betamax-matchers
5+, mock
6+, six
7+, pytestrunner
8+, prawcore
9+, pytest
10+, requests-toolbelt
11+, update_checker
12+, websocket_client
413}:
514
615buildPythonPackage rec {
716 pname = "praw";
8− version = "6.0.0";
17+ version = "6.3.1";
918
1019 src = fetchFromGitHub {
1120 owner = "praw-dev";
1221 repo = "praw";
1322 rev = "v${version}";
14− sha256 = "0y6nyz8vf98gl1qfmnznv3dbvlbzdl6mz99vk673nyfn3hbs451i";
23+ sha256 = "0by89aw7m803dvjcc33m9390msjm6v5v8g3k8ink9gfm421lw8ky";
1524 };
1625
17− postPatch = ''
18− # drop upper bound of prawcore requirement
19− sed -ri "s/'(prawcore >=.+), <.+'/'\1'/" setup.py
20− '';
26+ nativeBuildInputs = [
27+ pytestrunner
28+ ];
2129
2230 propagatedBuildInputs = [
23− requests
24− decorator
25− flake8
2631 mock
27− six
28− update_checker
29− pytestrunner
3032 prawcore
33+ update_checker
34+ websocket_client
3135 ];
3236
3337 checkInputs = [
34− pytest_3
3538 betamax
3639 betamax-serializers
3740 betamax-matchers
38− requests_toolbelt
41+ mock
42+ pytest
43+ requests-toolbelt
44+ six
3945 ];
4046
4147 meta = with stdenv.lib; {
4248 description = "Python Reddit API wrapper";
43− homepage = https://praw.readthedocs.org/;
44− license = licenses.gpl3;
49+ homepage = "https://praw.readthedocs.org/";
50+ license = licenses.bsd2;
4551 platforms = platforms.all;
4652 maintainers = with maintainers; [ ];
4753 };
pkgs/development/python-modules/websocket_client/default.nixnew file+25
@@ -0,0 +1,25 @@
1+{ lib, buildPythonPackage, fetchPypi, isPy27
2+, six
3+, backports_ssl_match_hostname
4+}:
5+
6+buildPythonPackage rec {
7+ version = "0.56.0";
8+ pname = "websocket_client";
9+
10+ src = fetchPypi {
11+ inherit pname version;
12+ sha256 = "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z";
13+ };
14+
15+ propagatedBuildInputs = [
16+ six
17+ ] ++ lib.optional isPy27 backports_ssl_match_hostname;
18+
19+ meta = with lib; {
20+ description = "Websocket client for python";
21+ homepage = "https://github.com/websocket-client/websocket-client";
22+ license = licenses.bsd3;
23+ maintainers = with maintainers; [ ];
24+ };
25+}
pkgs/development/python-modules/websockets_client/default.nixdeleted−24
@@ -1,24 +0,0 @@
1−{ stdenv, buildPythonPackage, fetchPypi, six }:
2−buildPythonPackage rec {
3− pname = "websocket_client";
4− version = "0.54.0";
5−
6− src = fetchPypi {
7− inherit version pname;
8− sha256 = "e51562c91ddb8148e791f0155fdb01325d99bb52c4cdbb291aee7a3563fd0849";
9− };
10−
11− prePatch = ''
12− # ssl.match_hostname exists in python2.7 version maintained in nixpkgs,
13− # the dependency is not necessary.
14− sed -e "s/\['backports.ssl_match_hostname'\]/\[\]/" -i setup.py
15− '';
16−
17− propagatedBuildInputs = [ six ];
18−
19− meta = with stdenv.lib; {
20− homepage = https://github.com/liris/websocket-client;
21− description = "Websocket client for python";
22− license = licenses.lgpl2;
23− };
24−}
pkgs/top-level/python-packages.nix+1−1
@@ -5091,7 +5091,7 @@ in {
50915091
50925092 larch = callPackage ../development/python-modules/larch { };
50935093
5094− websocket_client = callPackage ../development/python-modules/websockets_client { };
5094+ websocket_client = callPackage ../development/python-modules/websocket_client { };
50955095
50965096 webhelpers = callPackage ../development/python-modules/webhelpers { };
50975097