Skip to content

Commit

Permalink
Merge pull request #126940 from SuperSandro2000/websocket_client
Browse files Browse the repository at this point in the history
pythonPackages: websocket_client -> websocket-client
  • Loading branch information
dotlambda authored Jun 15, 2021
2 parents ff06400 + 7b4d273 commit 0b1ec4b
Show file tree
Hide file tree
Showing 45 changed files with 76 additions and 75 deletions.
2 changes: 1 addition & 1 deletion pkgs/applications/misc/octoprint/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ let
tornado
unidecode
watchdog
websocket_client
websocket-client
werkzeug
wrapt
zeroconf
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/ulauncher/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec {
python-Levenshtein
pyxdg
requests
websocket_client
websocket-client
];

checkInputs = with python3Packages; [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
env = "${buildEnv {
name = "wee-slack-env";
paths = with python3Packages; [
websocket_client
websocket-client
six
];
}}/${python3Packages.python.sitePackages}";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/p2p/zeronet/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
};

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
];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/video/streamlink/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
requests
iso-639
iso3166
websocket_client
websocket-client
isodate
]) ++ [
rtmpdump
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/docker-compose/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, mock, pytest, nose
, pyyaml, backports_ssl_match_hostname, colorama, docopt
, dockerpty, docker, ipaddress, jsonschema, requests
, six, texttable, websocket_client, cached-property
, six, texttable, websocket-client, cached-property
, enum34, functools32, paramiko, distro, python-dotenv
}:

Expand All @@ -22,7 +22,7 @@ buildPythonApplication rec {
checkInputs = [ mock pytest nose ];
propagatedBuildInputs = [
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
] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname
++ lib.optional (pythonOlder "3.4") enum34
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/aria2p/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, aria2, poetry, pytest, pytestcov, pytest_xdist, responses
, asciimatics, loguru, requests, setuptools, websocket_client
, asciimatics, loguru, requests, setuptools, websocket-client
}:

buildPythonPackage rec {
Expand Down Expand Up @@ -32,7 +32,7 @@ buildPythonPackage rec {
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; {
homepage = "https://github.com/pawamoy/aria2p";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
, pytestCheckHook
, pythonOlder
, requests
, websocket_client
, websocket-client
, zeroconf
}:

Expand All @@ -25,7 +25,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
zeroconf
websocket_client
websocket-client
];

checkInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/docker-py/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, six, requests, websocket_client, docker_pycreds }:
{ lib, buildPythonPackage, fetchPypi, six, requests, websocket-client, docker_pycreds }:

buildPythonPackage rec {
version = "1.10.6";
Expand All @@ -15,7 +15,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
six
requests
websocket_client
websocket-client
docker_pycreds
];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/docker/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
, pytestCheckHook
, requests
, six
, websocket_client
, websocket-client
}:

buildPythonPackage rec {
Expand All @@ -27,7 +27,7 @@ buildPythonPackage rec {
paramiko
requests
six
websocket_client
websocket-client
] ++ lib.optional isPy27 backports_ssl_match_hostname;

checkInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/gradient/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
, requests
, requests_toolbelt
, terminaltables
, websocket_client
, websocket-client
}:

buildPythonPackage rec {
Expand Down Expand Up @@ -55,7 +55,7 @@ buildPythonPackage rec {
requests
requests_toolbelt
terminaltables
websocket_client
websocket-client
];

# tries to use /homeless-shelter to mimic container usage, etc
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/homematicip/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
, pytest-aiohttp
, pytest-asyncio
, requests
, websocket_client
, websocket-client
, websockets
}:

Expand All @@ -31,7 +31,7 @@ buildPythonPackage rec {
aiohttp
async-timeout
requests
websocket_client
websocket-client
websockets
];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/ibm-watson/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
, tox
, requests
, python-dateutil
, websocket_client
, websocket-client
, ibm-cloud-sdk-core
}:

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, requests
, websocket_client, pythonOlder }:
, websocket-client, pythonOlder }:

buildPythonPackage rec {
pname = "jellyfin-apiclient-python";
Expand All @@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "sha256-nSLUa9/jAT6XrHo77kV5HYBxPO/lhcWKqPfpES7ul9A=";
};

propagatedBuildInputs = [ requests websocket_client ];
propagatedBuildInputs = [ requests websocket-client ];

doCheck = false; # no tests
pythonImportsCheck = [ "jellyfin_apiclient_python" ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/kubernetes/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ 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 }:

buildPythonPackage rec {
Expand Down Expand Up @@ -28,7 +28,7 @@ buildPythonPackage rec {
};

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; {
description = "Kubernetes python client";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/ledgerblue/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, fetchPypi, buildPythonPackage, hidapi
, pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
, websocket_client
, websocket-client
}:

buildPythonPackage rec {
Expand All @@ -13,7 +13,7 @@ buildPythonPackage rec {
};

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
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/libsoundtouch/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, fetchFromGitHub
, enum-compat
, requests
, websocket_client
, websocket-client
, zeroconf
, pytestCheckHook
}:
Expand All @@ -22,7 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
enum-compat
websocket_client
websocket-client
zeroconf
];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/orvibo/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
, pytest-runner
, pytestCheckHook
, requests
, websocket_client
, websocket-client
}:

buildPythonPackage rec {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/plexapi/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, fetchFromGitHub
, requests
, tqdm
, websocket_client
, websocket-client
, isPy27
}:

Expand All @@ -22,7 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
tqdm
websocket_client
websocket-client
];

# Tests require a running Plex instance
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/praw/6.3.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
, pytest
, requests-toolbelt
, update_checker
, websocket_client
, websocket-client
}:

buildPythonPackage rec {
Expand All @@ -31,7 +31,7 @@ buildPythonPackage rec {
mock
prawcore
update_checker
websocket_client
websocket-client
];

checkInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/praw/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
, pytestCheckHook
, requests-toolbelt
, update_checker
, websocket_client
, websocket-client
}:

buildPythonPackage rec {
Expand All @@ -27,7 +27,7 @@ buildPythonPackage rec {
mock
prawcore
update_checker
websocket_client
websocket-client
];

checkInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pushbullet/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, requests
, websocket_client
, websocket-client
, python_magic
, cryptography
, pytestCheckHook
Expand All @@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
};

propagatedBuildInputs = [ cryptography requests websocket_client python_magic ];
propagatedBuildInputs = [ cryptography requests websocket-client python_magic ];

preCheck = ''
export PUSHBULLET_API_KEY=""
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pyfireservicerota/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, pytz
, oauthlib
, requests
, websocket_client
, websocket-client
}:

buildPythonPackage rec {
Expand All @@ -20,7 +20,7 @@ buildPythonPackage rec {
pytz
oauthlib
requests
websocket_client
websocket-client
];

# no tests implemented
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pysc2/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
, pygame
, s2clientprotocol
, six
, websocket_client
, websocket-client
, sc2-headless
}:

Expand Down Expand Up @@ -49,7 +49,7 @@ buildPythonPackage {
pygame
s2clientprotocol
six
websocket_client
websocket-client
sc2-headless
];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/python-engineio/3.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
, requests
, six
, tornado
, websocket_client
, websocket-client
, websockets
, pytestCheckHook
, pythonAtLeast
Expand All @@ -37,7 +37,7 @@ buildPythonPackage rec {
mock
requests
tornado
websocket_client
websocket-client
websockets
pytestCheckHook
];
Expand Down
Loading

0 comments on commit 0b1ec4b

Please sign in to comment.