From d05ede7bac7ac4d5379371e68f57a6e1fbfe7a65 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 18 Jul 2024 00:42:08 +0200
Subject: [PATCH] python312Packages.pysmi: 0.3.4 -> 1.4.4

https://github.com/lextudio/pysmi/blob/v1.4.4/CHANGES.rst

Absorbs pysmi-lextudio, since the author of pysmi has passed away and
the lextudio fork has now become pysmi.
---
 .../python-modules/pysmi-lextudio/default.nix | 46 -----------------
 .../python-modules/pysmi/default.nix          | 50 +++++++++++++++----
 .../pysnmp-lextudio/default.nix               |  4 +-
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 5 files changed, 43 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pysmi-lextudio/default.nix

diff --git a/pkgs/development/python-modules/pysmi-lextudio/default.nix b/pkgs/development/python-modules/pysmi-lextudio/default.nix
deleted file mode 100644
index 1b6225c3f8bf..000000000000
--- a/pkgs/development/python-modules/pysmi-lextudio/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  jinja2,
-  ply,
-  poetry-core,
-  pythonOlder,
-  requests,
-}:
-
-buildPythonPackage rec {
-  pname = "pysmi-lextudio";
-  version = "1.4.3";
-  pyproject = true;
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "lextudio";
-    repo = "pysmi";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-JrWVoK7fqESUIJeprjB28iaqOEWgsTpTqUEmSZp9XDk=";
-  };
-
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [
-    jinja2
-    ply
-    requests
-  ];
-
-  # Circular dependency on pysnmp-lextudio
-  doCheck = false;
-
-  pythonImportsCheck = [ "pysmi" ];
-
-  meta = with lib; {
-    description = "SNMP MIB parser";
-    homepage = "https://github.com/lextudio/pysmi";
-    changelog = "https://github.com/lextudio/pysmi/blob/v${version}/CHANGES.rst";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix
index 0d268a6c63ad..b7d67be5274b 100644
--- a/pkgs/development/python-modules/pysmi/default.nix
+++ b/pkgs/development/python-modules/pysmi/default.nix
@@ -1,29 +1,59 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+
+  # build-system
+  poetry-core,
+
+  # dependencies
   ply,
+  jinja2,
+  requests,
+
+  # tests
+  pysmi,
+  pysnmp,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
-  version = "0.3.4";
-  format = "setuptools";
+  version = "1.4.4";
   pname = "pysmi";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "bd15a15020aee8376cab5be264c26330824a8b8164ed0195bd402dd59e4e8f7c";
+  src = fetchFromGitHub {
+    owner = "lextudio";
+    repo = "pysmi";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-9ArKo1UT4g+H8Z51NZ6rHlOhyz2grAc1V8Xl+ztfYic=";
   };
 
-  propagatedBuildInputs = [ ply ];
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    ply
+    jinja2
+    requests
+  ];
 
   # Tests require pysnmp, which in turn requires pysmi => infinite recursion
   doCheck = false;
 
+  nativeCheckInputs = [
+    pysnmp
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pysmi" ];
+
+  passthru.tests.pytest = pysmi.overridePythonAttrs { doCheck = true; };
+
   meta = with lib; {
-    homepage = "http://pysmi.sf.net";
-    description = "SNMP SMI/MIB Parser";
+    description = "SNMP MIB parser";
+    homepage = "https://github.com/lextudio/pysmi";
+    changelog = "https://github.com/lextudio/pysmi/blob/v${version}/CHANGES.rst";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ koral ];
+    maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pysnmp-lextudio/default.nix b/pkgs/development/python-modules/pysnmp-lextudio/default.nix
index d8df1a72c5c4..abca059a59a2 100644
--- a/pkgs/development/python-modules/pysnmp-lextudio/default.nix
+++ b/pkgs/development/python-modules/pysnmp-lextudio/default.nix
@@ -8,7 +8,7 @@
 
   # dependencies
   pyasn1,
-  pysmi-lextudio,
+  pysmi,
   pysnmpcrypto,
 
   # tests
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     pyasn1
-    pysmi-lextudio
+    pysmi
     pysnmpcrypto
   ];
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 7e2d1da92316..64b4f12cfcfa 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -469,6 +469,7 @@ mapAliases ({
   pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20
   pysmart-smartx = pysmart; # added 2021-10-22
   pySmartDL = pysmartdl; # added 2023-10-11
+  pysmi-lextudio = pysmi; # added 2024-07-18
   pysparse = throw "pysparse has been abandoned upstream."; # added 2023-02-28
   pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29
   PyStemmer = pystemmer; # added 2023-02-19
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a68839b7dea5..d4f3d37180fa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12087,8 +12087,6 @@ self: super: with self; {
 
   pysmi = callPackage ../development/python-modules/pysmi { };
 
-  pysmi-lextudio = callPackage ../development/python-modules/pysmi-lextudio { };
-
   pysml = callPackage ../development/python-modules/pysml { };
 
   pysmlight = callPackage ../development/python-modules/pysmlight { };