pythonPackages: websocket_client -> websocket-client

This commit is contained in:
Sandro Jäckel 2021-06-15 13:12:45 +02:00
parent 48cc7f1d1c
commit 7b4d273d3c
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
45 changed files with 76 additions and 75 deletions

View file

@ -134,7 +134,7 @@ let
tornado tornado
unidecode unidecode
watchdog watchdog
websocket_client websocket-client
werkzeug werkzeug
wrapt wrapt
zeroconf zeroconf

View file

@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec {
python-Levenshtein python-Levenshtein
pyxdg pyxdg
requests requests
websocket_client websocket-client
]; ];
checkInputs = with python3Packages; [ checkInputs = with python3Packages; [

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
env = "${buildEnv { env = "${buildEnv {
name = "wee-slack-env"; name = "wee-slack-env";
paths = with python3Packages; [ paths = with python3Packages; [
websocket_client websocket-client
six six
]; ];
}}/${python3Packages.python.sitePackages}"; }}/${python3Packages.python.sitePackages}";

View file

@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket_client gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket-client
gevent-websocket rencode bitcoinlib maxminddb pyopenssl gevent-websocket rencode bitcoinlib maxminddb pyopenssl
]; ];

View file

@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
requests requests
iso-639 iso-639
iso3166 iso3166
websocket_client websocket-client
isodate isodate
]) ++ [ ]) ++ [
rtmpdump rtmpdump

View file

@ -3,7 +3,7 @@
, mock, pytest, nose , mock, pytest, nose
, pyyaml, backports_ssl_match_hostname, colorama, docopt , pyyaml, backports_ssl_match_hostname, colorama, docopt
, dockerpty, docker, ipaddress, jsonschema, requests , dockerpty, docker, ipaddress, jsonschema, requests
, six, texttable, websocket_client, cached-property , six, texttable, websocket-client, cached-property
, enum34, functools32, paramiko, distro, python-dotenv , enum34, functools32, paramiko, distro, python-dotenv
}: }:
@ -22,7 +22,7 @@ buildPythonApplication rec {
checkInputs = [ mock pytest nose ]; checkInputs = [ mock pytest nose ];
propagatedBuildInputs = [ propagatedBuildInputs = [
pyyaml colorama dockerpty docker pyyaml colorama dockerpty docker
ipaddress jsonschema requests six texttable websocket_client ipaddress jsonschema requests six texttable websocket-client
docopt cached-property paramiko distro python-dotenv docopt cached-property paramiko distro python-dotenv
] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname ] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname
++ lib.optional (pythonOlder "3.4") enum34 ++ lib.optional (pythonOlder "3.4") enum34

View file

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder { lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, aria2, poetry, pytest, pytestcov, pytest_xdist, responses , aria2, poetry, pytest, pytestcov, pytest_xdist, responses
, asciimatics, loguru, requests, setuptools, websocket_client , asciimatics, loguru, requests, setuptools, websocket-client
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -32,7 +32,7 @@ buildPythonPackage rec {
pytest -nauto -k "not test_api and not test_cli and not test_interface" pytest -nauto -k "not test_api and not test_cli and not test_interface"
''; '';
propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket_client ]; propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket-client ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/pawamoy/aria2p"; homepage = "https://github.com/pawamoy/aria2p";

View file

@ -6,7 +6,7 @@
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, requests , requests
, websocket_client , websocket-client
, zeroconf , zeroconf
}: }:
@ -25,7 +25,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
requests requests
zeroconf zeroconf
websocket_client websocket-client
]; ];
checkInputs = [ checkInputs = [

View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, six, requests, websocket_client, docker_pycreds }: { lib, buildPythonPackage, fetchPypi, six, requests, websocket-client, docker_pycreds }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.10.6"; version = "1.10.6";
@ -15,7 +15,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
six six
requests requests
websocket_client websocket-client
docker_pycreds docker_pycreds
]; ];

View file

@ -9,7 +9,7 @@
, pytestCheckHook , pytestCheckHook
, requests , requests
, six , six
, websocket_client , websocket-client
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -27,7 +27,7 @@ buildPythonPackage rec {
paramiko paramiko
requests requests
six six
websocket_client websocket-client
] ++ lib.optional isPy27 backports_ssl_match_hostname; ] ++ lib.optional isPy27 backports_ssl_match_hostname;
checkInputs = [ checkInputs = [

View file

@ -17,7 +17,7 @@
, requests , requests
, requests_toolbelt , requests_toolbelt
, terminaltables , terminaltables
, websocket_client , websocket-client
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -55,7 +55,7 @@ buildPythonPackage rec {
requests requests
requests_toolbelt requests_toolbelt
terminaltables terminaltables
websocket_client websocket-client
]; ];
# tries to use /homeless-shelter to mimic container usage, etc # tries to use /homeless-shelter to mimic container usage, etc

View file

@ -10,7 +10,7 @@
, pytest-aiohttp , pytest-aiohttp
, pytest-asyncio , pytest-asyncio
, requests , requests
, websocket_client , websocket-client
, websockets , websockets
}: }:
@ -31,7 +31,7 @@ buildPythonPackage rec {
aiohttp aiohttp
async-timeout async-timeout
requests requests
websocket_client websocket-client
websockets websockets
]; ];

View file

@ -8,7 +8,7 @@
, tox , tox
, requests , requests
, python-dateutil , python-dateutil
, websocket_client , websocket-client
, ibm-cloud-sdk-core , ibm-cloud-sdk-core
}: }:
@ -34,7 +34,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
requests requests
python-dateutil python-dateutil
websocket_client websocket-client
ibm-cloud-sdk-core ibm-cloud-sdk-core
]; ];

View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, requests { lib, buildPythonPackage, fetchPypi, requests
, websocket_client, pythonOlder }: , websocket-client, pythonOlder }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "jellyfin-apiclient-python"; pname = "jellyfin-apiclient-python";
@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "sha256-nSLUa9/jAT6XrHo77kV5HYBxPO/lhcWKqPfpES7ul9A="; sha256 = "sha256-nSLUa9/jAT6XrHo77kV5HYBxPO/lhcWKqPfpES7ul9A=";
}; };
propagatedBuildInputs = [ requests websocket_client ]; propagatedBuildInputs = [ requests websocket-client ];
doCheck = false; # no tests doCheck = false; # no tests
pythonImportsCheck = [ "jellyfin_apiclient_python" ]; pythonImportsCheck = [ "jellyfin_apiclient_python" ];

View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, { lib, buildPythonPackage, fetchPypi, pythonAtLeast,
ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal, ipaddress, websocket-client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal,
isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }:
buildPythonPackage rec { buildPythonPackage rec {
@ -28,7 +28,7 @@ buildPythonPackage rec {
}; };
checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];
propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ]; propagatedBuildInputs = [ ipaddress websocket-client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ];
meta = with lib; { meta = with lib; {
description = "Kubernetes python client"; description = "Kubernetes python client";

View file

@ -1,6 +1,6 @@
{ lib, fetchPypi, buildPythonPackage, hidapi { lib, fetchPypi, buildPythonPackage, hidapi
, pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex , pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
, websocket_client , websocket-client
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -13,7 +13,7 @@ buildPythonPackage rec {
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket_client hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket-client
]; ];
# No tests # No tests

View file

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, enum-compat , enum-compat
, requests , requests
, websocket_client , websocket-client
, zeroconf , zeroconf
, pytestCheckHook , pytestCheckHook
}: }:
@ -22,7 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
requests requests
enum-compat enum-compat
websocket_client websocket-client
zeroconf zeroconf
]; ];

View file

@ -6,7 +6,7 @@
, pytest-runner , pytest-runner
, pytestCheckHook , pytestCheckHook
, requests , requests
, websocket_client , websocket-client
}: }:
buildPythonPackage rec { buildPythonPackage rec {

View file

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, requests , requests
, tqdm , tqdm
, websocket_client , websocket-client
, isPy27 , isPy27
}: }:
@ -22,7 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
requests requests
tqdm tqdm
websocket_client websocket-client
]; ];
# Tests require a running Plex instance # Tests require a running Plex instance

View file

@ -9,7 +9,7 @@
, pytest , pytest
, requests-toolbelt , requests-toolbelt
, update_checker , update_checker
, websocket_client , websocket-client
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -31,7 +31,7 @@ buildPythonPackage rec {
mock mock
prawcore prawcore
update_checker update_checker
websocket_client websocket-client
]; ];
checkInputs = [ checkInputs = [

View file

@ -9,7 +9,7 @@
, pytestCheckHook , pytestCheckHook
, requests-toolbelt , requests-toolbelt
, update_checker , update_checker
, websocket_client , websocket-client
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -27,7 +27,7 @@ buildPythonPackage rec {
mock mock
prawcore prawcore
update_checker update_checker
websocket_client websocket-client
]; ];
checkInputs = [ checkInputs = [

View file

@ -2,7 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, requests , requests
, websocket_client , websocket-client
, python_magic , python_magic
, cryptography , cryptography
, pytestCheckHook , pytestCheckHook
@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64"; sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
}; };
propagatedBuildInputs = [ cryptography requests websocket_client python_magic ]; propagatedBuildInputs = [ cryptography requests websocket-client python_magic ];
preCheck = '' preCheck = ''
export PUSHBULLET_API_KEY="" export PUSHBULLET_API_KEY=""

View file

@ -4,7 +4,7 @@
, pytz , pytz
, oauthlib , oauthlib
, requests , requests
, websocket_client , websocket-client
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -20,7 +20,7 @@ buildPythonPackage rec {
pytz pytz
oauthlib oauthlib
requests requests
websocket_client websocket-client
]; ];
# no tests implemented # no tests implemented

View file

@ -12,7 +12,7 @@
, pygame , pygame
, s2clientprotocol , s2clientprotocol
, six , six
, websocket_client , websocket-client
, sc2-headless , sc2-headless
}: }:
@ -49,7 +49,7 @@ buildPythonPackage {
pygame pygame
s2clientprotocol s2clientprotocol
six six
websocket_client websocket-client
sc2-headless sc2-headless
]; ];

View file

@ -10,7 +10,7 @@
, requests , requests
, six , six
, tornado , tornado
, websocket_client , websocket-client
, websockets , websockets
, pytestCheckHook , pytestCheckHook
, pythonAtLeast , pythonAtLeast
@ -37,7 +37,7 @@ buildPythonPackage rec {
mock mock
requests requests
tornado tornado
websocket_client websocket-client
websockets websockets
pytestCheckHook pytestCheckHook
]; ];

View file

@ -9,7 +9,7 @@
, requests , requests
, six , six
, tornado , tornado
, websocket_client , websocket-client
, websockets , websockets
, pytestCheckHook , pytestCheckHook
}: }:
@ -31,7 +31,7 @@ buildPythonPackage rec {
mock mock
requests requests
tornado tornado
websocket_client websocket-client
websockets websockets
pytestCheckHook pytestCheckHook
]; ];

View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests { lib, buildPythonPackage, fetchFromGitHub, requests
, tqdm, websocket_client, pythonOlder }: , tqdm, websocket-client, pythonOlder }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-mpv-jsonipc"; pname = "python-mpv-jsonipc";
@ -16,7 +16,7 @@ buildPythonPackage rec {
# 'mpv-jsonipc' does not have any tests # 'mpv-jsonipc' does not have any tests
doCheck = false; doCheck = false;
propagatedBuildInputs = [ requests tqdm websocket_client ]; propagatedBuildInputs = [ requests tqdm websocket-client ];
pythonImportsCheck = [ "python_mpv_jsonipc" ]; pythonImportsCheck = [ "python_mpv_jsonipc" ];

View file

@ -7,7 +7,7 @@
, pythonOlder , pythonOlder
, requests , requests
, six , six
, websocket_client , websocket-client
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -31,7 +31,7 @@ buildPythonPackage rec {
ifaddr ifaddr
requests requests
six six
websocket_client websocket-client
]; ];
patches = [ patches = [

View file

@ -21,7 +21,7 @@
, deepdiff , deepdiff
, pytestCheckHook , pytestCheckHook
, pytestcov , pytestcov
, websocket_client , websocket-client
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -62,7 +62,7 @@ buildPythonPackage rec {
deepdiff deepdiff
pytestCheckHook pytestCheckHook
pytestcov pytestcov
websocket_client websocket-client
]; ];
disabledTests = [ disabledTests = [

View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi { lib, buildPythonPackage, fetchPypi
, websocket_client , websocket-client
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -12,7 +12,7 @@ buildPythonPackage rec {
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
websocket_client websocket-client
]; ];
# no tests # no tests

View file

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, isPy27 { lib, buildPythonPackage, fetchPypi, isPy27
, requests , requests
, websocket_client , websocket-client
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -14,7 +14,7 @@ buildPythonPackage rec {
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
websocket_client websocket-client
requests requests
]; ];

View file

@ -15,7 +15,7 @@
, pytestCheckHook , pytestCheckHook
, pytestrunner , pytestrunner
, sqlalchemy , sqlalchemy
, websocket_client , websocket-client
, websockets , websockets
}: }:
@ -36,7 +36,7 @@ buildPythonPackage rec {
aiohttp aiohttp
boto3 boto3
sqlalchemy sqlalchemy
websocket_client websocket-client
websockets websockets
]; ];

View file

@ -14,7 +14,7 @@
, requests , requests
, responses , responses
, six , six
, websocket_client , websocket-client
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -32,7 +32,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp aiohttp
websocket_client websocket-client
requests requests
six six
]; ];

View file

@ -6,7 +6,7 @@
, pytest-runner , pytest-runner
, pytestCheckHook , pytestCheckHook
, requests , requests
, websocket_client , websocket-client
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -24,7 +24,7 @@ buildPythonPackage rec {
click click
pytest-runner pytest-runner
requests requests
websocket_client websocket-client
]; ];
checkInputs = [ checkInputs = [

View file

@ -8,11 +8,12 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "websocket_client"; pname = "websocket-client";
version = "0.58.0"; version = "0.58.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; pname = "websocket_client";
inherit version;
sha256 = "sha256-Y1CbQdFYrlt/Z+tK0g/su07umUNOc+FANU3D/44JcW8="; sha256 = "sha256-Y1CbQdFYrlt/Z+tK0g/su07umUNOc+FANU3D/44JcW8=";
}; };

View file

@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec {
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
pyserial colorama websocket_client pyserial colorama websocket-client
]; ];
doCheck = false; doCheck = false;

View file

@ -208,7 +208,7 @@ self: super: {
}); });
ensime-vim = super.ensime-vim.overrideAttrs (old: { ensime-vim = super.ensime-vim.overrideAttrs (old: {
passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; passthru.python3Dependencies = ps: with ps; [ sexpdata websocket-client ];
dependencies = with self; [ vimproc-vim vimshell-vim self.self forms ]; dependencies = with self; [ vimproc-vim vimshell-vim self.self forms ];
}); });

View file

@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec {
sockjs sockjs
uvloop uvloop
voluptuous voluptuous
websocket_client websocket-client
yarl yarl
]; ];

View file

@ -323,7 +323,7 @@
"google_translate" = ps: with ps; [ gtts ]; "google_translate" = ps: with ps; [ gtts ];
"google_travel_time" = ps: with ps; [ googlemaps ]; "google_travel_time" = ps: with ps; [ googlemaps ];
"google_wifi" = ps: with ps; [ ]; "google_wifi" = ps: with ps; [ ];
"gpmdp" = ps: with ps; [ websocket_client ]; "gpmdp" = ps: with ps; [ websocket-client ];
"gpsd" = ps: with ps; [ gps3 ]; "gpsd" = ps: with ps; [ gps3 ];
"gpslogger" = ps: with ps; [ aiohttp-cors ]; "gpslogger" = ps: with ps; [ aiohttp-cors ];
"graphite" = ps: with ps; [ ]; "graphite" = ps: with ps; [ ];

View file

@ -145,7 +145,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
sshtunnel sshtunnel
urllib3 urllib3
vsts-cd-manager vsts-cd-manager
websocket_client websocket-client
xmltodict xmltodict
javaproperties javaproperties
jsondiff jsondiff

View file

@ -499,11 +499,10 @@ let
}; };
}); });
websocket_client = super.websocket_client.overridePythonAttrs(oldAttrs: rec { websocket-client = super.websocket-client.overridePythonAttrs(oldAttrs: rec {
version = "0.56.0"; version = "0.56.0";
src = super.fetchPypi { src = oldAttrs.src.override {
inherit (oldAttrs) pname;
inherit version; inherit version;
sha256 = "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z"; sha256 = "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z";
}; };

View file

@ -17,7 +17,7 @@ let
propagatedBuildInputs = with self; [ propagatedBuildInputs = with self; [
six six
requests requests
websocket_client websocket-client
ipaddress ipaddress
docker_pycreds docker_pycreds
uptime uptime

View file

@ -79,7 +79,7 @@ in with localPython.pkgs; buildPythonApplication rec {
# Otherwise, awsebcli will try to install it using pip when using some # Otherwise, awsebcli will try to install it using pip when using some
# commands (like "eb local run"). # commands (like "eb local run").
blessed botocore cement colorama dockerpty docopt pathspec pyyaml blessed botocore cement colorama dockerpty docopt pathspec pyyaml
requests semantic-version setuptools tabulate termcolor websocket_client requests semantic-version setuptools tabulate termcolor websocket-client
]; ];
postInstall = '' postInstall = ''

View file

@ -52,4 +52,5 @@ mapAliases ({
smart_open = smart-open; # added 2021-03-14 smart_open = smart-open; # added 2021-03-14
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22
websocket_client = websocket-client;
}) })

View file

@ -8937,7 +8937,7 @@ in {
webrtcvad = callPackage ../development/python-modules/webrtcvad { }; webrtcvad = callPackage ../development/python-modules/webrtcvad { };
websocket_client = callPackage ../development/python-modules/websocket_client { }; websocket-client = callPackage ../development/python-modules/websocket-client { };
websockets = callPackage ../development/python-modules/websockets { }; websockets = callPackage ../development/python-modules/websockets { };