python312Packages.python-socks: 2.4.4 -> 2.5.1, python312Packages.asyncwhois: 1.1.4 -> 1.1.5

pkgs/development/python-modules/aiohttp-socks/default.nix

@@ -28,7 +28,7 @@ buildPythonPackage rec {
     aiohttp
     attrs
     python-socks
-  ];
+  ] ++ python-socks.optional-dependencies.asyncio;
 
   # Checks needs internet access
   doCheck = false;

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

@@ -2,19 +2,19 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  hatchling,
   pytest-asyncio,
   pytest-mock,
   pytestCheckHook,
   python-socks,
   pythonOlder,
-  setuptools,
   tldextract,
   whodap,
 }:
 
 buildPythonPackage rec {
   pname = "asyncwhois";
-  version = "1.1.4";
+  version = "1.1.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,21 +23,16 @@ buildPythonPackage rec {
     owner = "pogzyb";
     repo = "asyncwhois";
     rev = "refs/tags/v${version}";
-    hash = "sha256-BjHGp94vad5qTvffiU8ZEOxYeXNzQHlNq1SaxviYfps=";
+    hash = "sha256-y5JmAbrk9qJeNYejNcz5nI5bghaetUw1xkD8qgwOkao=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "python-socks[asyncio]" "python-socks"
-  '';
-
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   dependencies = [
     python-socks
     tldextract
     whodap
-  ];
+  ] ++ python-socks.optional-dependencies.asyncio;
 
   nativeCheckInputs = [
     pytest-asyncio
@@ -68,7 +63,7 @@ buildPythonPackage rec {
     description = "Python module for retrieving WHOIS information";
     homepage = "https://github.com/pogzyb/asyncwhois";
     changelog = "https://github.com/pogzyb/asyncwhois/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
 }

pkgs/development/python-modules/httpx-socks/default.nix

@@ -34,13 +34,13 @@ buildPythonPackage rec {
     hash = "sha256-9v5DfxEtM7jq+b8wR0M1klTSnSdFjQ4aDl8ZSZWxbFA=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     httpx
     httpcore
     python-socks
-  ];
+  ] ++ python-socks.optional-dependencies.asyncio;
 
   passthru.optional-dependencies = {
     asyncio = [ async-timeout ];

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

@@ -10,34 +10,36 @@
   pytest-trio,
   pythonOlder,
   pytestCheckHook,
+  setuptools,
   trio,
   trustme,
   yarl,
 }:
 
 buildPythonPackage rec {
   pname = "python-socks";
-  version = "2.4.4";
-  format = "setuptools";
+  version = "2.5.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6.2";
+  disabled = pythonOlder "3.7";
 
   __darwinAllowLocalNetworking = true;
 
   src = fetchFromGitHub {
     owner = "romis2012";
     repo = "python-socks";
     rev = "refs/tags/v${version}";
-    hash = "sha256-c1fjSHi7LvaOeZwTOTSY/ZVr27/j03CdAra1PSa9Jt0=";
+    hash = "sha256-QPA7Ge1eJa5YxpD8OLAYkV7fvwgPxA5Z+OlyKr3F5Vg=";
   };
 
-  propagatedBuildInputs = [
-    trio
-    curio
-    async-timeout
-  ];
+  build-system = [ setuptools ];
 
-  doCheck = false; # requires tiny_proxy module
+  optional-dependencies = {
+    anyio = [ anyio ];
+    asyncio = [ async-timeout ];
+    curio = [ curio ];
+    trio = [ trio ];
+  };
 
   nativeCheckInputs = [
     anyio
@@ -49,12 +51,14 @@ buildPythonPackage rec {
     yarl
   ];
 
+  doCheck = false; # requires tiny_proxy module
+
   pythonImportsCheck = [ "python_socks" ];
 
   meta = with lib; {
-    changelog = "https://github.com/romis2012/python-socks/releases/tag/v${version}";
     description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python";
     homepage = "https://github.com/romis2012/python-socks";
+    changelog = "https://github.com/romis2012/python-socks/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = [ ];
   };

pkgs/development/python-modules/ripe-atlas-cousteau/default.nix

@@ -5,37 +5,37 @@
   jsonschema,
   pytestCheckHook,
   python-dateutil,
-  python-socketio,
   pythonOlder,
   requests,
+  setuptools,
+  typing-extensions,
   websocket-client,
 }:
 
 buildPythonPackage rec {
   pname = "ripe-atlas-cousteau";
   version = "2.0.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "RIPE-NCC";
-    repo = pname;
+    repo = "ripe-atlas-cousteau";
     rev = "refs/tags/v${version}";
     hash = "sha256-z8ZXOiCVYughrbmXfnwtks7NPmYpII2BA0+8mr1cdSQ=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "websocket-client~=1.3.1" "websocket-client"
-  '';
+  pythonRelaxDeps = [ "websocket-client" ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     python-dateutil
     requests
-    python-socketio
+    typing-extensions
     websocket-client
-  ] ++ python-socketio.optional-dependencies.client;
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook

pkgs/development/python-modules/websocket-client/default.nix

@@ -13,28 +13,33 @@ buildPythonPackage rec {
   version = "1.8.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     pname = "websocket_client";
     inherit version;
     hash = "sha256-Mjnfn0TaYy+WASRygF1AojKBqZECfOEdL0Wm8krEw9o=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ python-socks ];
+  optional-dependencies = {
+    optional = [
+      python-socks
+      # wsaccel is not available at the moment
+    ];
+  };
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "websocket" ];
 
   meta = with lib; {
     description = "Websocket client for Python";
-    mainProgram = "wsdump";
     homepage = "https://github.com/websocket-client/websocket-client";
     changelog = "https://github.com/websocket-client/websocket-client/blob/v${version}/ChangeLog";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "wsdump";
   };
 }