python312Packages.deepdiff: 8.2.0 -> 8.4.1 (#393688)

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

@@ -2,25 +2,23 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   setuptools,
 
   # dependencies
-  click,
   orderly-set,
-  orjson,
 
   # optional-dependencies
-  clevercsv,
+  click,
+  orjson,
+  pyyaml,
 
   # tests
   jsonpickle,
   numpy,
   pytestCheckHook,
   python-dateutil,
-  pyyaml,
   toml,
   tomli-w,
   polars,
@@ -29,16 +27,14 @@
 
 buildPythonPackage rec {
   pname = "deepdiff";
-  version = "8.2.0";
+  version = "8.4.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "seperman";
     repo = "deepdiff";
     tag = version;
-    hash = "sha256-5RiYVNdKfTRNeqtbKwFdbB5Z12eAMNdaOFCNevR6H6w=";
+    hash = "sha256-RXr+6DLzhnuow9JNqqnNmuehE89eOY4oYn4tw4VSI+A=";
   };
 
   build-system = [
@@ -46,23 +42,16 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
-    click
     orderly-set
-    orjson
-  ];
-  pythonRelaxDeps = [
-    # Upstream develops this package as well, and from some reason pins this
-    # dependency to a patch version below this one. No significant changes
-    # happend in that release, so we shouldn't worry, especially if tests pass.
-    "orderly-set"
   ];
 
   optional-dependencies = {
     cli = [
-      clevercsv
       click
       pyyaml
-      toml
+    ];
+    optimize = [
+      orjson
     ];
   };
 
@@ -74,7 +63,7 @@ buildPythonPackage rec {
     tomli-w
     polars
     pandas
-  ] ++ optional-dependencies.cli;
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [
     # not compatible with pydantic 2.x
@@ -91,7 +80,7 @@ buildPythonPackage rec {
     description = "Deep Difference and Search of any Python object/data";
     mainProgram = "deep";
     homepage = "https://github.com/seperman/deepdiff";
-    changelog = "https://github.com/seperman/deepdiff/releases/tag/${version}";
+    changelog = "https://github.com/seperman/deepdiff/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       mic92

pkgs/development/python-modules/orderly-set/default.nix

@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   setuptools,
@@ -13,23 +12,15 @@
 
 buildPythonPackage rec {
   pname = "orderly-set";
-  version = "5.2.2";
+  version = "5.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "seperman";
     repo = "orderly-set";
     tag = version;
-    hash = "sha256-ZDo5fSHD0lCn9CRQtWK10QeZoOhuXG3LR3KA/to9gpE=";
+    hash = "sha256-8tqQR8Oa/1jcfokBVKdvsC7Ya26bn0XHM9/QsstM07E=";
   };
-  patches = [
-    # https://github.com/seperman/orderly-set/pull/5
-    (fetchpatch {
-      name = "do-not-import-mypy.patch";
-      url = "https://github.com/seperman/orderly-set/commit/34362084868a081b8ebaaf1f13c93a7a798ef557.patch";
-      hash = "sha256-eKbnA31ykm5fH0om6cfOaMpy+ZNNWRDkHieaUIHF8OM=";
-    })
-  ];
 
   build-system = [
     setuptools
@@ -47,7 +38,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    description = "Orderly Set previously known as Ordered Set";
+    description = "Multiple implementations of Ordered Set";
     homepage = "https://github.com/seperman/orderly-set";
     changelog = "https://github.com/seperman/orderly-set/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;