pythonPackages: websocket_client -> websocket-client

2024-11-10 08:39:08 +03:00 · 2021-06-15 13:12:45 +02:00 · 2021-06-15 13:12:45 +02:00 · 7b4d273d3c
commit 7b4d273d3c
parent 48cc7f1d1c
45 changed files with 76 additions and 75 deletions
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@ -134,7 +134,7 @@ let
                tornado
                unidecode
                watchdog
-                websocket_client
+                websocket-client
                werkzeug
                wrapt
                zeroconf
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec {
    python-Levenshtein
    pyxdg
    requests
-    websocket_client
+    websocket-client
  ];

  checkInputs = with python3Packages; [
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
      env = "${buildEnv {
        name = "wee-slack-env";
        paths = with python3Packages; [
-          websocket_client
+          websocket-client
          six
        ];
      }}/${python3Packages.python.sitePackages}";
--- a/pkgs/applications/networking/p2p/zeronet/default.nix
+++ b/pkgs/applications/networking/p2p/zeronet/default.nix
@ -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
  ];

--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
    requests
    iso-639
    iso3166
-    websocket_client
+    websocket-client
    isodate
  ]) ++ [
    rtmpdump
--- a/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/pkgs/applications/virtualization/docker-compose/default.nix
@ -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
 }:

@ -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
--- a/pkgs/development/python-modules/aria2p/default.nix
+++ b/pkgs/development/python-modules/aria2p/default.nix
@ -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 {
@ -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";
--- a/pkgs/development/python-modules/devolo-home-control-api/default.nix
+++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix
@ -6,7 +6,7 @@
 , pytestCheckHook
 , pythonOlder
 , requests
-, websocket_client
+, websocket-client
 , zeroconf
 }:

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

  checkInputs = [
--- a/pkgs/development/python-modules/docker-py/default.nix
+++ b/pkgs/development/python-modules/docker-py/default.nix
@ -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";
@ -15,7 +15,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    six
    requests
-    websocket_client
+    websocket-client
    docker_pycreds
  ];

--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@ -9,7 +9,7 @@
 , pytestCheckHook
 , requests
 , six
-, websocket_client
+, websocket-client
 }:

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

  checkInputs = [
--- a/pkgs/development/python-modules/gradient/default.nix
+++ b/pkgs/development/python-modules/gradient/default.nix
@ -17,7 +17,7 @@
 , requests
 , requests_toolbelt
 , terminaltables
-, websocket_client
+, websocket-client
 }:

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

  # tries to use /homeless-shelter to mimic container usage, etc
--- a/pkgs/development/python-modules/homematicip/default.nix
+++ b/pkgs/development/python-modules/homematicip/default.nix
@ -10,7 +10,7 @@
 , pytest-aiohttp
 , pytest-asyncio
 , requests
-, websocket_client
+, websocket-client
 , websockets
 }:

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

--- a/pkgs/development/python-modules/ibm-watson/default.nix
+++ b/pkgs/development/python-modules/ibm-watson/default.nix
@ -8,7 +8,7 @@
 , tox
 , requests
 , python-dateutil
-, websocket_client
+, websocket-client
 , ibm-cloud-sdk-core
 }:

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

--- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
+++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, requests
-, websocket_client, pythonOlder }:
+, websocket-client, pythonOlder }:

 buildPythonPackage rec {
  pname = "jellyfin-apiclient-python";
@ -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" ];
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@ -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 {
@ -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";
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@ -1,6 +1,6 @@
 { lib, fetchPypi, buildPythonPackage, hidapi
 , pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
-, websocket_client
+, websocket-client
 }:

 buildPythonPackage rec {
@ -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
--- a/pkgs/development/python-modules/libsoundtouch/default.nix
+++ b/pkgs/development/python-modules/libsoundtouch/default.nix
@ -3,7 +3,7 @@
 , fetchFromGitHub
 , enum-compat
 , requests
-, websocket_client
+, websocket-client
 , zeroconf
 , pytestCheckHook
 }:
@ -22,7 +22,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    requests
    enum-compat
-    websocket_client
+    websocket-client
    zeroconf
  ];

--- a/pkgs/development/python-modules/orvibo/default.nix
+++ b/pkgs/development/python-modules/orvibo/default.nix
@ -6,7 +6,7 @@
 , pytest-runner
 , pytestCheckHook
 , requests
-, websocket_client
+, websocket-client
 }:

 buildPythonPackage rec {
--- a/pkgs/development/python-modules/plexapi/default.nix
+++ b/pkgs/development/python-modules/plexapi/default.nix
@ -3,7 +3,7 @@
 , fetchFromGitHub
 , requests
 , tqdm
-, websocket_client
+, websocket-client
 , isPy27
 }:

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

  # Tests require a running Plex instance
--- a/pkgs/development/python-modules/praw/6.3.nix
+++ b/pkgs/development/python-modules/praw/6.3.nix
@ -9,7 +9,7 @@
 , pytest
 , requests-toolbelt
 , update_checker
-, websocket_client
+, websocket-client
 }:

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

  checkInputs = [
--- a/pkgs/development/python-modules/praw/default.nix
+++ b/pkgs/development/python-modules/praw/default.nix
@ -9,7 +9,7 @@
 , pytestCheckHook
 , requests-toolbelt
 , update_checker
-, websocket_client
+, websocket-client
 }:

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

  checkInputs = [
--- a/pkgs/development/python-modules/pushbullet/default.nix
+++ b/pkgs/development/python-modules/pushbullet/default.nix
@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , requests
-, websocket_client
+, websocket-client
 , python_magic
 , cryptography
 , pytestCheckHook
@ -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=""
--- a/pkgs/development/python-modules/pyfireservicerota/default.nix
+++ b/pkgs/development/python-modules/pyfireservicerota/default.nix
@ -4,7 +4,7 @@
 , pytz
 , oauthlib
 , requests
-, websocket_client
+, websocket-client
 }:

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

  # no tests implemented
--- a/pkgs/development/python-modules/pysc2/default.nix
+++ b/pkgs/development/python-modules/pysc2/default.nix
@ -12,7 +12,7 @@
 , pygame
 , s2clientprotocol
 , six
-, websocket_client
+, websocket-client
 , sc2-headless
 }:

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

--- a/pkgs/development/python-modules/python-engineio/3.nix
+++ b/pkgs/development/python-modules/python-engineio/3.nix
@ -10,7 +10,7 @@
 , requests
 , six
 , tornado
-, websocket_client
+, websocket-client
 , websockets
 , pytestCheckHook
 , pythonAtLeast
@ -37,7 +37,7 @@ buildPythonPackage rec {
    mock
    requests
    tornado
-    websocket_client
+    websocket-client
    websockets
    pytestCheckHook
  ];
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@ -9,7 +9,7 @@
 , requests
 , six
 , tornado
-, websocket_client
+, websocket-client
 , websockets
 , pytestCheckHook
 }:
@ -31,7 +31,7 @@ buildPythonPackage rec {
    mock
    requests
    tornado
-    websocket_client
+    websocket-client
    websockets
    pytestCheckHook
  ];
--- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
+++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchFromGitHub, requests
-, tqdm, websocket_client, pythonOlder }:
+, tqdm, websocket-client, pythonOlder }:

 buildPythonPackage rec {
  pname = "python-mpv-jsonipc";
@ -16,7 +16,7 @@ buildPythonPackage rec {
  # 'mpv-jsonipc' does not have any tests
  doCheck = false;

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

  pythonImportsCheck = [ "python_mpv_jsonipc" ];

--- a/pkgs/development/python-modules/roonapi/default.nix
+++ b/pkgs/development/python-modules/roonapi/default.nix
@ -7,7 +7,7 @@
 , pythonOlder
 , requests
 , six
-, websocket_client
+, websocket-client
 }:

 buildPythonPackage rec {
@ -31,7 +31,7 @@ buildPythonPackage rec {
    ifaddr
    requests
    six
-    websocket_client
+    websocket-client
  ];

  patches = [
--- a/pkgs/development/python-modules/runway-python/default.nix
+++ b/pkgs/development/python-modules/runway-python/default.nix
@ -21,7 +21,7 @@
 , deepdiff
 , pytestCheckHook
 , pytestcov
-, websocket_client
+, websocket-client
 }:

 buildPythonPackage rec {
@ -62,7 +62,7 @@ buildPythonPackage rec {
    deepdiff
    pytestCheckHook
    pytestcov
-    websocket_client
+    websocket-client
  ];

  disabledTests = [
--- a/pkgs/development/python-modules/samsungctl/default.nix
+++ b/pkgs/development/python-modules/samsungctl/default.nix
@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi
-, websocket_client
+, websocket-client
 }:

 buildPythonPackage rec {
@ -12,7 +12,7 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [
-    websocket_client
+    websocket-client
  ];

  # no tests
--- a/pkgs/development/python-modules/samsungtvws/default.nix
+++ b/pkgs/development/python-modules/samsungtvws/default.nix
@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchPypi, isPy27
 , requests
-, websocket_client
+, websocket-client
 }:

 buildPythonPackage rec {
@ -14,7 +14,7 @@ buildPythonPackage rec {
  };

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

--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@ -15,7 +15,7 @@
 , pytestCheckHook
 , pytestrunner
 , sqlalchemy
-, websocket_client
+, websocket-client
 , websockets
 }:

@ -36,7 +36,7 @@ buildPythonPackage rec {
    aiohttp
    boto3
    sqlalchemy
-    websocket_client
+    websocket-client
    websockets
  ];

--- a/pkgs/development/python-modules/slackclient/default.nix
+++ b/pkgs/development/python-modules/slackclient/default.nix
@ -14,7 +14,7 @@
 , requests
 , responses
 , six
-, websocket_client
+, websocket-client
 }:

 buildPythonPackage rec {
@ -32,7 +32,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    aiohttp
-    websocket_client
+    websocket-client
    requests
    six
  ];
--- a/pkgs/development/python-modules/waterfurnace/default.nix
+++ b/pkgs/development/python-modules/waterfurnace/default.nix
@ -6,7 +6,7 @@
 , pytest-runner
 , pytestCheckHook
 , requests
-, websocket_client
+, websocket-client
 }:

 buildPythonPackage rec {
@ -24,7 +24,7 @@ buildPythonPackage rec {
    click
    pytest-runner
    requests
-    websocket_client
+    websocket-client
  ];

  checkInputs = [
--- a/pkgs/development/python-modules/websocket-client/default.nix
+++ b/pkgs/development/python-modules/websocket-client/default.nix
@ -8,11 +8,12 @@
 }:

 buildPythonPackage rec {
-  pname = "websocket_client";
+  pname = "websocket-client";
  version = "0.58.0";

  src = fetchPypi {
-    inherit pname version;
+    pname = "websocket_client";
+    inherit version;
    sha256 = "sha256-Y1CbQdFYrlt/Z+tK0g/su07umUNOc+FANU3D/44JcW8=";
  };

--- a/pkgs/development/tools/mpfshell/default.nix
+++ b/pkgs/development/tools/mpfshell/default.nix
@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec {
  };

  propagatedBuildInputs = with python3Packages; [
-    pyserial colorama websocket_client
+    pyserial colorama websocket-client
  ];

  doCheck = false;
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@ -208,7 +208,7 @@ self: super: {
  });

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

--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec {
    sockjs
    uvloop
    voluptuous
-    websocket_client
+    websocket-client
    yarl
  ];

--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@ -323,7 +323,7 @@
    "google_translate" = ps: with ps; [ gtts ];
    "google_travel_time" = ps: with ps; [ googlemaps ];
    "google_wifi" = ps: with ps; [ ];
-    "gpmdp" = ps: with ps; [ websocket_client ];
+    "gpmdp" = ps: with ps; [ websocket-client ];
    "gpsd" = ps: with ps; [ gps3 ];
    "gpslogger" = ps: with ps; [ aiohttp-cors ];
    "graphite" = ps: with ps; [ ];
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@ -145,7 +145,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
    sshtunnel
    urllib3
    vsts-cd-manager
-    websocket_client
+    websocket-client
    xmltodict
    javaproperties
    jsondiff
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/pkgs/tools/admin/azure-cli/python-packages.nix
@ -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";

-        src = super.fetchPypi {
-          inherit (oldAttrs) pname;
+        src = oldAttrs.src.override {
          inherit version;
          sha256 = "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z";
        };
--- a/pkgs/tools/networking/dd-agent/5.nix
+++ b/pkgs/tools/networking/dd-agent/5.nix
@ -17,7 +17,7 @@ let
        propagatedBuildInputs = with self; [
          six
          requests
-          websocket_client
+          websocket-client
          ipaddress
          docker_pycreds
          uptime
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@ -79,7 +79,7 @@ in with localPython.pkgs; buildPythonApplication rec {
    # Otherwise, awsebcli will try to install it using pip when using some
    # commands (like "eb local run").
    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 = ''
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -52,4 +52,5 @@ mapAliases ({
  smart_open = smart-open; # added 2021-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
+  websocket_client = websocket-client;
 })
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -8937,7 +8937,7 @@ in {

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