Merge pull request #307505 from fabaff/dulwich-revert

Revert "python312Packages.dulwich: 0.21.7 -> 0.22.1"

4 files changed, 136 insertions, 103 deletions

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 5ce01aaad1b58..49789421af346 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -1,37 +1,36 @@
-{
-  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 {
+  version = "0.21.7";
   pname = "dulwich";
-  version = "0.22.1";
-  pyproject = true;
+  format = "setuptools";
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "jelmer";
     repo = "dulwich";
     rev = "refs/tags/${pname}-${version}";
-    hash = "sha256-bf3ZUMX4afpdTBpFnx0HMyzCNG6V/p4eOl36djxGbtk=";
+    hash = "sha256-iP+6KtaQ8tfOobovSLSJZogS/XWW0LuHgE2oV8uQW/8=";
   };
 
   build-system = [
@@ -39,18 +38,22 @@ buildPythonPackage rec {
     setuptools-rust
   ];
 
-  dependencies = [
+  propagatedBuildInputs = [
     certifi
     urllib3
   ];
 
   passthru.optional-dependencies = {
-    fastimport = [ fastimport ];
+    fastimport = [
+      fastimport
+    ];
     pgp = [
       gpgme
       gnupg
     ];
-    paramiko = [ paramiko ];
+    paramiko = [
+      paramiko
+    ];
   };
 
   nativeCheckInputs = [
@@ -60,18 +63,31 @@ buildPythonPackage rec {
     glibcLocales
     pytest-xdist
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
+  ] ++ passthru.optional-dependencies.fastimport
+  ++ passthru.optional-dependencies.pgp
+  ++ passthru.optional-dependencies.paramiko;
 
   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
-    "tests/contrib/test_swift_smoke.py"
-    # Import issue
-    "tests/test_greenthreads.py"
+    # missing test inputs
+    "dulwich/contrib/test_swift_smoke.py"
+    # flaky on high core count >4
+    "dulwich/tests/compat/test_client.py"
   ];
 
-  pythonImportsCheck = [ "dulwich" ];
+  pythonImportsCheck = [
+    "dulwich"
+  ];
 
   meta = with lib; {
     description = "Implementation of the Git file formats and protocols";
@@ -81,10 +97,7 @@ 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 ];
   };
 }
diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix
index 47c07b911e600..f9190e727a1da 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.1";
+  version = "3.50.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -67,7 +67,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "dvc";
     rev = "refs/tags/${version}";
-    hash = "sha256-sY4iU2YdljgpWQXwL8sE424ft0LDjcKf0Q2xZeyv4xs=";
+    hash = "sha256-/MvKWpJzKWLj1+y8nPMQiAwdktmQyJNM+s6ctYNk9u0=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix
index 33adbdf07a08b..7090433431a9e 100644
--- a/pkgs/development/python-modules/dvclive/default.nix
+++ b/pkgs/development/python-modules/dvclive/default.nix
@@ -1,39 +1,38 @@
-{
-  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 {
   pname = "dvclive";
-  version = "3.46.0";
+  version = "3.45.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -42,10 +41,12 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "dvclive";
     rev = "refs/tags/${version}";
-    hash = "sha256-yIViKlkCdoG2vSZdScL38fZd9musLRKzBd9wSR6lJdk=";
+    hash = "sha256-76PjBPr3m1y5osW024dkhuvuXl2FiZ5oxlJ1Ucq8msI=";
   };
 
-  build-system = [ setuptools-scm ];
+  build-system = [
+    setuptools-scm
+  ];
 
   dependencies = [
     dvc
@@ -80,17 +81,29 @@ 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
@@ -98,19 +111,25 @@ 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";
diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix
index 0c8de7e546bfd..e902cac511017 100644
--- a/pkgs/development/python-modules/scmrepo/default.nix
+++ b/pkgs/development/python-modules/scmrepo/default.nix
@@ -1,26 +1,25 @@
-{
-  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 {
   pname = "scmrepo";
-  version = "3.3.2";
+  version = "3.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,7 +28,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "scmrepo";
     rev = "refs/tags/${version}";
-    hash = "sha256-8lKiJCvER4Vg6L11WAykmgg37LWiYMsswS38Dtmb2Rc=";
+    hash = "sha256-swv5uWsyM4mEXlurizUewnbdAOtjWgvzCO9IPfz2ZPE=";
   };
 
   build-system = [
@@ -54,7 +53,9 @@ buildPythonPackage rec {
   # Requires a running Docker instance
   doCheck = false;
 
-  pythonImportsCheck = [ "scmrepo" ];
+  pythonImportsCheck = [
+    "scmrepo"
+  ];
 
   meta = with lib; {
     description = "SCM wrapper and fsspec filesystem";