diff --git a/pkgs/applications/misc/databricks-sql-cli/default.nix b/pkgs/applications/misc/databricks-sql-cli/default.nix index ae118501f47de..ab51f7f1d1afb 100644 --- a/pkgs/applications/misc/databricks-sql-cli/default.nix +++ b/pkgs/applications/misc/databricks-sql-cli/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchpatch , python3 +, pythonRelaxDepsHook }: python3.pkgs.buildPythonApplication rec { @@ -24,15 +25,20 @@ python3.pkgs.buildPythonApplication rec { }) ]; + pythonRelaxDeps = [ + "pandas" + "databricks-sql-connector" + "sqlparse" + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace 'python = ">=3.7.1,<4.0"' 'python = ">=3.8,<4.0"' \ - --replace 'pandas = "1.3.4"' 'pandas = "~1.5"' ''; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = (with python3.pkgs; [ poetry-core - ]; + ]) ++ [ pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ cli-helpers diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index fdbee91fdae4d..9903e2ef8d75d 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -12,28 +12,41 @@ pyarrow, pytestCheckHook, pythonOlder, + pythonAtLeast, pythonRelaxDepsHook, sqlalchemy, thrift, + requests, + urllib3, + fetchpatch, }: buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "3.1.0"; + version = "3.3.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + # Depends on thrift that at the moment do not work in Python 3.12 + # see PR 328415 fix this. + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-LiA+zZuhPPXgBb8B1vZ/PuAYMrBXzxgd1CXwugf0mk8="; + hash = "sha256-a3OeKJ3c2UCClsPMah7iJY2YvIVLfHmmBuHAx8vdXZs="; }; + patches = [ + (fetchpatch { + name = "fix-pandas.patch"; + url = "https://patch-diff.githubusercontent.com/raw/databricks/databricks-sql-python/pull/416.patch"; + sha256 = "sha256-sNCp8xSSmKP2yNzDK4wyWC5Hoe574AeHnKTeNcIxaek="; + }) + ]; + pythonRelaxDeps = [ - "numpy" - "thrift" + "pyarrow" ]; nativeBuildInputs = [ @@ -51,6 +64,8 @@ buildPythonPackage rec { pyarrow sqlalchemy thrift + requests + urllib3 ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -65,8 +80,5 @@ buildPythonPackage rec { changelog = "https://github.com/databricks/databricks-sql-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ harvidsen ]; - # No SQLAlchemy 2.0 support - # https://github.com/databricks/databricks-sql-python/issues/91 - broken = true; }; }