From 506f5754ee959ec4f1ff2b35a0f0e03bbca0bb37 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 Feb 2024 10:46:31 +0100
Subject: python311Packages.objax: refactor

---
 pkgs/development/python-modules/objax/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix
index 24a14b37f98ca..15c09722fe8f7 100644
--- a/pkgs/development/python-modules/objax/default.nix
+++ b/pkgs/development/python-modules/objax/default.nix
@@ -2,22 +2,26 @@
 , buildPythonPackage
 , fetchFromGitHub
 , fetchpatch
-, jaxlib
 , jax
+, jaxlib
+, keras
 , numpy
 , parameterized
 , pillow
+, pytestCheckHook
+, pythonOlder
 , scipy
+, setuptools
 , tensorboard
-, keras
-, pytestCheckHook
 , tensorflow
 }:
 
 buildPythonPackage rec {
   pname = "objax";
   version = "1.8.0";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "google";
@@ -26,6 +30,10 @@ buildPythonPackage rec {
     hash = "sha256-WD+pmR8cEay4iziRXqF3sHUzCMBjmLJ3wZ3iYOD+hzk=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   # Avoid propagating the dependency on `jaxlib`, see
   # https://github.com/NixOS/nixpkgs/issues/156767
   buildInputs = [
@@ -65,8 +73,9 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    description = "Objax is a machine learning framework that provides an Object Oriented layer for JAX.";
+    description = "Machine learning framework that provides an Object Oriented layer for JAX";
     homepage = "https://github.com/google/objax";
+    changelog = "https://github.com/google/objax/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ ndl ];
   };
-- 
cgit 1.4.1


From fe85853abeabdd441d4b21c56ab695e4dd312a48 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 Feb 2024 10:50:44 +0100
Subject: python311Packages.objax: disable failing tests

---
 pkgs/development/python-modules/objax/default.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix
index 15c09722fe8f7..7f2725e9d286b 100644
--- a/pkgs/development/python-modules/objax/default.nix
+++ b/pkgs/development/python-modules/objax/default.nix
@@ -70,6 +70,8 @@ buildPythonPackage rec {
   disabledTests = [
     # Test requires internet access for prefetching some weights
     "test_pretrained_keras_weight_0_ResNet50V2"
+    # ModuleNotFoundError: No module named 'tree'
+    "TestResNetV2Pretrained"
   ];
 
   meta = with lib; {
-- 
cgit 1.4.1