From 5cef65b22d9e6434997ca5bcccf55c06c40d3f9d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 15:39:35 +0200 Subject: [PATCH 1/8] python312Packages.dulwich: refactor --- pkgs/development/python-modules/dulwich/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 97b27d14bd35..a0690f4bb7e3 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -14,13 +14,14 @@ , pytest-xdist , pytestCheckHook , pythonOlder +, setuptools , urllib3 }: buildPythonPackage rec { - version = "0.21.7"; pname = "dulwich"; - format = "setuptools"; + version = "0.21.7"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -29,9 +30,11 @@ buildPythonPackage rec { hash = "sha256-qenGaDPOpYDDrBKSfkuXEZhddq/KmNqXFAXUFN5g6Wg="; }; - LC_ALL = "en_US.UTF-8"; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ certifi urllib3 ]; From 82d7a8b959a101dc9cc873b6aba3cfe45101f692 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 15:47:33 +0200 Subject: [PATCH 2/8] python312Packages.dulwich: 0.21.7 -> 0.22.1 Changelog: https://github.com/jelmer/dulwich/blob/dulwich-0.22.1/NEWS --- .../python-modules/dulwich/default.nix | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index a0690f4bb7e3..ec048f0d4cad 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , certifi , fastimport -, fetchPypi +, fetchFromGitHub , gevent , geventhttpclient , git @@ -15,23 +15,27 @@ , pytestCheckHook , pythonOlder , setuptools +, setuptools-rust , urllib3 }: buildPythonPackage rec { pname = "dulwich"; - version = "0.21.7"; + version = "0.22.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-qenGaDPOpYDDrBKSfkuXEZhddq/KmNqXFAXUFN5g6Wg="; + src = fetchFromGitHub { + owner = "jelmer"; + repo = "dulwich"; + rev = "refs/tags/${version}"; + hash = "sha256-bf3ZUMX4afpdTBpFnx0HMyzCNG6V/p4eOl36djxGbtk="; }; build-system = [ setuptools + setuptools-rust ]; dependencies = [ @@ -59,26 +63,15 @@ buildPythonPackage rec { glibcLocales pytest-xdist pytestCheckHook - ] ++ passthru.optional-dependencies.fastimport - ++ passthru.optional-dependencies.pgp - ++ passthru.optional-dependencies.paramiko; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); doCheck = !stdenv.isDarwin; - disabledTests = [ - # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpsqwlbpd1/\xc0' - "test_no_decode_encode" - # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpwmtfyvo2/refs.git/refs/heads/\xcd\xee\xe2\xe0\xff\xe2\xe5\xf2\xea\xe01' - "test_cyrillic" - # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpfseetobk/test/\xc0' - "test_commit_no_encode_decode" - ]; - disabledTestPaths = [ - # missing test inputs - "dulwich/contrib/test_swift_smoke.py" - # flaky on high core count >4 - "dulwich/tests/compat/test_client.py" + # Missing test inputs + "tests/contrib/test_swift_smoke.py" + # Import issue + "tests/test_greenthreads.py" ]; pythonImportsCheck = [ From c220a30c605861a6087f32bcaf1e75f9aed6dfb4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 15:48:59 +0200 Subject: [PATCH 3/8] python312Packages.dulwich: forma twith nixfmt --- .../python-modules/dulwich/default.nix | 56 +++++++++---------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index ec048f0d4cad..35f98ab6eb6d 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -1,22 +1,23 @@ -{ lib -, stdenv -, buildPythonPackage -, certifi -, fastimport -, fetchFromGitHub -, gevent -, geventhttpclient -, git -, glibcLocales -, gnupg -, gpgme -, paramiko -, pytest-xdist -, pytestCheckHook -, pythonOlder -, setuptools -, setuptools-rust -, urllib3 +{ + lib, + stdenv, + buildPythonPackage, + certifi, + fastimport, + fetchFromGitHub, + gevent, + geventhttpclient, + git, + glibcLocales, + gnupg, + gpgme, + paramiko, + pytest-xdist, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-rust, + urllib3, }: buildPythonPackage rec { @@ -44,16 +45,12 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - fastimport = [ - fastimport - ]; + fastimport = [ fastimport ]; pgp = [ gpgme gnupg ]; - paramiko = [ - paramiko - ]; + paramiko = [ paramiko ]; }; nativeCheckInputs = [ @@ -74,9 +71,7 @@ buildPythonPackage rec { "tests/test_greenthreads.py" ]; - pythonImportsCheck = [ - "dulwich" - ]; + pythonImportsCheck = [ "dulwich" ]; meta = with lib; { description = "Implementation of the Git file formats and protocols"; @@ -86,7 +81,10 @@ buildPythonPackage rec { ''; homepage = "https://www.dulwich.io/"; changelog = "https://github.com/jelmer/dulwich/blob/dulwich-${version}/NEWS"; - license = with licenses; [ asl20 gpl2Plus ]; + license = with licenses; [ + asl20 + gpl2Plus + ]; maintainers = with maintainers; [ koral ]; }; } From 202686c284e7596bc9b8a153da599adc7e3a5b2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Apr 2024 15:10:51 +0200 Subject: [PATCH 4/8] python312Packages.scmrepo: 3.3.1 -> 3.3.2 Diff: https://github.com/iterative/scmrepo/compare/refs/tags/3.3.1...3.3.2 Changelog: https://github.com/iterative/scmrepo/releases/tag/3.3.2 --- pkgs/development/python-modules/scmrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index e902cac51101..fc748ef6eca0 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "3.3.1"; + version = "3.3.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "scmrepo"; rev = "refs/tags/${version}"; - hash = "sha256-swv5uWsyM4mEXlurizUewnbdAOtjWgvzCO9IPfz2ZPE="; + hash = "sha256-8lKiJCvER4Vg6L11WAykmgg37LWiYMsswS38Dtmb2Rc="; }; build-system = [ From 596f33317f5de2dd690853e5f8dcc70ca0626769 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Apr 2024 15:11:22 +0200 Subject: [PATCH 5/8] python312Packages.scmrepo: format with nixfmt --- .../python-modules/scmrepo/default.nix | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index fc748ef6eca0..0c8de7e546bf 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -1,20 +1,21 @@ -{ lib -, asyncssh -, buildPythonPackage -, dulwich -, dvc-http -, dvc-objects -, fetchFromGitHub -, fsspec -, funcy -, gitpython -, pathspec -, pygit2 -, pygtrie -, pythonOlder -, setuptools -, setuptools-scm -, shortuuid +{ + lib, + asyncssh, + buildPythonPackage, + dulwich, + dvc-http, + dvc-objects, + fetchFromGitHub, + fsspec, + funcy, + gitpython, + pathspec, + pygit2, + pygtrie, + pythonOlder, + setuptools, + setuptools-scm, + shortuuid, }: buildPythonPackage rec { @@ -53,9 +54,7 @@ buildPythonPackage rec { # Requires a running Docker instance doCheck = false; - pythonImportsCheck = [ - "scmrepo" - ]; + pythonImportsCheck = [ "scmrepo" ]; meta = with lib; { description = "SCM wrapper and fsspec filesystem"; From d7ab5cd0c4366b78a347cd4ff6c04fe000c2a4fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Apr 2024 15:25:53 +0200 Subject: [PATCH 6/8] python311Packages.dvclive: 3.45.0 -> 3.46.0 Diff: https://github.com/iterative/dvclive/compare/refs/tags/3.45.0...3.46.0 Changelog: https://github.com/iterative/dvclive/releases/tag/3.46.0 --- pkgs/development/python-modules/dvclive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 7090433431a9..fd78c6ca873d 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.45.0"; + version = "3.46.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvclive"; rev = "refs/tags/${version}"; - hash = "sha256-76PjBPr3m1y5osW024dkhuvuXl2FiZ5oxlJ1Ucq8msI="; + hash = "sha256-yIViKlkCdoG2vSZdScL38fZd9musLRKzBd9wSR6lJdk="; }; build-system = [ From ab6032f43a4fa031b81e9d7c10d4128feb6a6da5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Apr 2024 15:26:51 +0200 Subject: [PATCH 7/8] python311Packages.dvclive: format with nixfmt --- .../python-modules/dvclive/default.nix | 101 +++++++----------- 1 file changed, 41 insertions(+), 60 deletions(-) diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index fd78c6ca873d..33adbdf07a08 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -1,33 +1,34 @@ -{ lib -, buildPythonPackage -, datasets -, dvc -, dvc-render -, dvc-studio-client -, fastai -, fetchFromGitHub -, funcy -, gto -, jsonargparse -, lightgbm -, lightning -, matplotlib -, mmcv -, numpy -, optuna -, pandas -, pillow -, psutil -, pynvml -, pythonOlder -, ruamel-yaml -, scikit-learn -, scmrepo -, setuptools-scm -, tensorflow -, torch -, transformers -, xgboost +{ + lib, + buildPythonPackage, + datasets, + dvc, + dvc-render, + dvc-studio-client, + fastai, + fetchFromGitHub, + funcy, + gto, + jsonargparse, + lightgbm, + lightning, + matplotlib, + mmcv, + numpy, + optuna, + pandas, + pillow, + psutil, + pynvml, + pythonOlder, + ruamel-yaml, + scikit-learn, + scmrepo, + setuptools-scm, + tensorflow, + torch, + transformers, + xgboost, }: buildPythonPackage rec { @@ -44,9 +45,7 @@ buildPythonPackage rec { hash = "sha256-yIViKlkCdoG2vSZdScL38fZd9musLRKzBd9wSR6lJdk="; }; - build-system = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; dependencies = [ dvc @@ -81,29 +80,17 @@ buildPythonPackage rec { numpy pillow ]; - sklearn = [ - scikit-learn - ]; + sklearn = [ scikit-learn ]; plots = [ pandas scikit-learn numpy ]; - markdown = [ - matplotlib - ]; - mmcv = [ - mmcv - ]; - tf = [ - tensorflow - ]; - xgb = [ - xgboost - ]; - lgbm = [ - lightgbm - ]; + markdown = [ matplotlib ]; + mmcv = [ mmcv ]; + tf = [ tensorflow ]; + xgb = [ xgboost ]; + lgbm = [ lightgbm ]; huggingface = [ datasets transformers @@ -111,25 +98,19 @@ buildPythonPackage rec { # catalyst = [ # catalyst # ]; - fastai = [ - fastai - ]; + fastai = [ fastai ]; lightning = [ lightning torch jsonargparse ] ++ jsonargparse.optional-dependencies.signatures; - optuna = [ - optuna - ]; + optuna = [ optuna ]; }; # Circular dependency with dvc doCheck = false; - pythonImportsCheck = [ - "dvclive" - ]; + pythonImportsCheck = [ "dvclive" ]; meta = with lib; { description = "Library for logging machine learning metrics and other metadata in simple file formats"; From 124fc242c15349850743dde1255a5c53734c7132 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Apr 2024 15:27:21 +0200 Subject: [PATCH 8/8] dvc: 3.50.0 -> 3.50.1 Diff: https://github.com/iterative/dvc/compare/refs/tags/3.50.0...3.50.1 Changelog: https://github.com/iterative/dvc/releases/tag/3.50.1 --- pkgs/development/python-modules/dvc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index f9190e727a1d..47c07b911e60 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.50.0"; + version = "3.50.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -67,7 +67,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-/MvKWpJzKWLj1+y8nPMQiAwdktmQyJNM+s6ctYNk9u0="; + hash = "sha256-sY4iU2YdljgpWQXwL8sE424ft0LDjcKf0Q2xZeyv4xs="; }; pythonRelaxDeps = [