python312Packages.autobahn: 23.6.2 -> 24.4.2 (#344348)

Author: fpletz

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

@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   attrs,
   argon2-cffi,
   base58,
@@ -28,7 +28,7 @@
   pygobject3,
   pyopenssl,
   qrcode,
-  pytest-asyncio_0_21,
+  pytest-asyncio,
   python-snappy,
   pytestCheckHook,
   pythonOlder,
@@ -50,21 +50,18 @@
 
 buildPythonPackage rec {
   pname = "autobahn";
-  version = "23.6.2";
+  version = "24.4.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-7JQhxSohAzZNHvBGgDbmAZ7oT3FyHoazb+Ga1pZsEYE=";
+  src = fetchFromGitHub {
+    owner = "crossbario";
+    repo = "autobahn-python";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-aeTE4a37zr83KZ+v947XikzFrHAhkZ4mj4tXdkQnB84=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "pytest>=2.8.6,<3.3.0" "pytest"
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -77,7 +74,7 @@ buildPythonPackage rec {
   nativeCheckInputs =
     [
       mock
-      pytest-asyncio_0_21
+      pytest-asyncio
       pytestCheckHook
     ]
     ++ optional-dependencies.scram ++ optional-dependencies.serialization ++ optional-dependencies.xbr;
@@ -87,7 +84,10 @@ buildPythonPackage rec {
     export USE_ASYNCIO=1
   '';
 
-  pytestFlagsArray = [ "--pyargs autobahn" ];
+  pytestFlagsArray = [
+    "--ignore=./autobahn/twisted"
+    "./autobahn"
+  ];
 
   pythonImportsCheck = [ "autobahn" ];
 
@@ -141,6 +141,7 @@ buildPythonPackage rec {
   };
 
   meta = with lib; {
+    changelog = "https://github.com/crossbario/autobahn-python/blob/${src.rev}/docs/changelog.rst";
     description = "WebSocket and WAMP in Python for Twisted and asyncio";
     homepage = "https://crossbar.io/autobahn";
     license = licenses.mit;

pkgs/development/python-modules/magic-wormhole/default.nix

@@ -58,6 +58,10 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [
+    "spake2"
+  ];
+
   dependencies = [
     attrs
     autobahn

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

@@ -1,35 +1,28 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   fetchpatch2,
   setuptools,
-  hkdf,
+  cryptography,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "spake2";
-  version = "0.8";
+  version = "0.9";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4";
+  src = fetchFromGitHub {
+    owner = "warner";
+    repo = "python-spake2";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-WPMGH1OzG+5O+2lNl2sv06/dNardY+BHYDS290Z36vQ=";
   };
 
-  patches = [
-    # https://github.com/warner/python-spake2/pull/16
-    (fetchpatch2 {
-      name = "python312-compat.patch";
-      url = "https://github.com/warner/python-spake2/commit/1b04d33106b105207c97c64b2589c45790720b0b.patch";
-      hash = "sha256-OoBz0lN17VyVGg6UfT+Zj9M1faFTNpPIhxrwCgUwMc8=";
-    })
-  ];
+  build-system = [ setuptools ];
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ hkdf ];
+  dependencies = [ cryptography ];
 
   pythonImportsCheck = [ "spake2" ];