Merge pull request #196320 from fabaff/dbx-bump

dbx: 0.6.8 -> 0.7.6

2 files changed, 45 insertions, 45 deletions

diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix
index 506f26096626d..517b24597a898 100644
--- a/pkgs/applications/misc/dbx/default.nix
+++ b/pkgs/applications/misc/dbx/default.nix
@@ -1,78 +1,78 @@
-{ buildPythonPackage
+{ lib
 , fetchFromGitHub
-, databricks-cli
-, scipy
-, path
-, pathspec
-, pydantic
-, protobuf
-, tqdm
-, mlflow
-, azure-identity
-, ruamel-yaml
-, emoji
-, cookiecutter
-, retry
-, azure-mgmt-datafactory
-, azure-mgmt-subscription
-, pytestCheckHook
-, pytest-asyncio
-, pytest-timeout
-, pytest-mock
-, lib
 , git
+, python3
 }:
 
-buildPythonPackage rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "dbx";
-  version = "0.6.8";
+  version = "0.7.6";
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "databrickslabs";
     repo = "dbx";
     rev = "v${version}";
-    sha256 = "sha256-Ou+VdHFVQzmsxJiyaeDd/+FqHvJZeNGB+OXyoagJwtk=";
+    hash = "sha256-P/cniy0xYaDoUbKdvV7KCubCpmOAhYp3cg2VBRA+a6I=";
   };
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
+    aiohttp
+    click
+    cookiecutter
+    cryptography
     databricks-cli
-    scipy
-    path
+    jinja2
+    mlflow
     pathspec
     pydantic
-    protobuf
-    tqdm
-    mlflow
-    azure-identity
-    ruamel-yaml
-    emoji
-    cookiecutter
+    pyyaml
+    requests
     retry
-    azure-mgmt-datafactory
-    azure-mgmt-subscription
-  ];
+    rich
+    typer
+    watchdog
+  ] ++ typer.optional-dependencies.all;
 
   checkInputs = [
-    pytestCheckHook
+    git
+  ] ++ (with python3.pkgs; [
     pytest-asyncio
-    pytest-timeout
     pytest-mock
-    git
-  ];
+    pytest-timeout
+    pytestCheckHook
+  ]);
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "mlflow-skinny>=1.28.0,<=2.0.0" "mlflow" \
+      --replace "rich==12.5.1" "rich"
+  '';
 
   preCheck = ''
-    export HOME=$TMPDIR
+    export HOME=$(mktemp -d)
+    export PATH="$PATH:$out/bin"
   '';
 
+  pytestFlagsArray = [
+    "tests/unit"
+  ];
+
   disabledTests = [
-    # fails because of dbfs CLI wrong call
+    # Fails because of dbfs CLI wrong call
     "test_dbfs_unknown_user"
     "test_dbfs_no_root"
+    # Requires pylint, prospector, pydocstyle
+    "test_python_basic_sanity_check"
+  ];
+
+  pythonImportsCheck = [
+    "dbx"
   ];
 
   meta = with lib; {
-    homepage = "https://github.com/databrickslabs/dbx";
     description = "CLI tool for advanced Databricks jobs management";
+    homepage = "https://github.com/databrickslabs/dbx";
     license = licenses.databricks-dbx;
     maintainers = with maintainers; [ GuillaumeDesforges ];
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59ac04d248802..9981749b3a120 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3693,7 +3693,7 @@ with pkgs;
 
   dbus-broker = callPackage ../os-specific/linux/dbus-broker { };
 
-  dbx = python3Packages.callPackage ../applications/misc/dbx { };
+  dbx = callPackage ../applications/misc/dbx { };
 
   ioport = callPackage ../os-specific/linux/ioport {};