diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index e698d53f433d..5c01cb734d75 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -1,49 +1,67 @@ { lib , buildPythonPackage , fetchFromGitHub -, thrift +, lz4 +, numpy +, oauthlib , pandas -, pyarrow , poetry-core +, pyarrow , pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, thrift }: buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "2.2.1"; + version = "2.3.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-EMLUXGeVGIXFeaMvaJ+crivRZtOt7W/LCycIO2gwqXA="; + hash = "sha256-XyDkL/bGnivx7MRG86vGS69mKdrWw7kKiuvQfBYFKVQ="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'thrift = "^0.13.0"' 'thrift = ">=0.13.0,<1.0.0"' - ''; + pythonRelaxDeps = [ + "numpy" + "thrift" + ]; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ - thrift + lz4 + numpy + oauthlib pandas pyarrow + thrift ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit" ]; + pytestFlagsArray = [ + "tests/unit" + ]; + + pythonImportsCheck = [ + "databricks" + ]; meta = with lib; { description = "Databricks SQL Connector for Python"; homepage = "https://docs.databricks.com/dev-tools/python-sql-connector.html"; + changelog = "https://github.com/databricks/databricks-sql-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ harvidsen ]; }; diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 863ed3ccc221..73b03cf83cb2 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -1,21 +1,17 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder -, python - -# native inputs , pkgconfig -, setuptools-scm - -# tests , psutil , pytestCheckHook +, python +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "python-lz4"; - version = "4.3.1"; + version = "4.3.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -25,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-XWkCZhBapjtzH3g3t+xXiB2f54p3Xw0+UBKVNH+gGHQ="; + sha256 = "sha256-aVnXCrTh+0Ip+FgYWN7hLw8N3iQCmXSywhReD5RTUfI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,8 +31,8 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - setuptools-scm pkgconfig + setuptools-scm ]; pythonImportsCheck = [ @@ -47,8 +43,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook psutil + pytestCheckHook ]; # for lz4.steam @@ -63,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "LZ4 Bindings for Python"; homepage = "https://github.com/python-lz4/python-lz4"; + changelog = "https://github.com/python-lz4/python-lz4/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; };