Merge pull request #216197 from fabaff/aioguardian-at

python311Packages.aioguardian: drop asynctest 

2 files changed, 16 insertions, 14 deletions

diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix
index fcbe12a11db7..83f623162962 100644
--- a/pkgs/development/python-modules/aioguardian/default.nix
+++ b/pkgs/development/python-modules/aioguardian/default.nix
@@ -2,7 +2,6 @@
 , aiohttp
 , async-timeout
 , asyncio-dgram
-, asynctest
 , buildPythonPackage
 , docutils
 , fetchFromGitHub
@@ -10,22 +9,24 @@
 , pytest-aiohttp
 , pytest-asyncio
 , pytestCheckHook
+, pythonOlder
 , voluptuous
 }:
 
 buildPythonPackage rec {
   pname = "aioguardian";
   version = "2022.10.0";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "bachya";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo=";
+    hash = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo=";
   };
 
-  format = "pyproject";
-
   nativeBuildInputs = [
     poetry-core
   ];
@@ -40,17 +41,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     asyncio-dgram
-    asynctest
     pytest-aiohttp
     pytest-asyncio
     pytestCheckHook
   ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'docutils = "<0.18"' 'docutils = "*"'
-  '';
-
   disabledTestPaths = [
     "examples/"
   ];
@@ -62,10 +57,11 @@ buildPythonPackage rec {
   meta = with lib; {
     description = " Python library to interact with Elexa Guardian devices";
     longDescription = ''
-      aioguardian is a Pytho3, asyncio-focused library for interacting with the
+      aioguardian is an asyncio-focused library for interacting with the
       Guardian line of water valves and sensors from Elexa.
     '';
     homepage = "https://github.com/bachya/aioguardian";
+    changelog = "https://github.com/bachya/aioguardian/releases/tag/${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix
index baf4702126f9..f999cd3b3b34 100644
--- a/pkgs/development/python-modules/asyncio-dgram/default.nix
+++ b/pkgs/development/python-modules/asyncio-dgram/default.nix
@@ -17,20 +17,25 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jsbronder";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q=";
+    rev = "refs/tagsv${version}";
+    hash = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q=";
   };
 
   nativeCheckInputs = [
-    pytest-asyncio
     pytestCheckHook
   ];
 
+  checkInputs = [
+    pytest-asyncio
+  ];
+
   # OSError: AF_UNIX path too long
   doCheck = !stdenv.isDarwin;
 
   disabledTests = [
     "test_protocol_pause_resume"
+    # TypeError: socket type must be 2
+    "test_from_socket_bad_socket"
   ];
 
   pythonImportsCheck = [
@@ -40,6 +45,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python support for higher level Datagram";
     homepage = "https://github.com/jsbronder/asyncio-dgram";
+    changelog = "https://github.com/jsbronder/asyncio-dgram/blob/v${version}/ChangeLog";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };