From 4dc28559924cd13be1a7b6d8b0f7ce526f7c3205 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jan 2023 13:48:46 +0100 Subject: [PATCH 1/4] python310Packages.python-lz4: add changelog to meta --- pkgs/development/python-modules/lz4/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 863ed3ccc221..041420187a94 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -1,16 +1,12 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder -, python - -# native inputs , pkgconfig -, setuptools-scm - -# tests , psutil , pytestCheckHook +, python +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { @@ -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 ]; }; From 827995378da3eee0f783c36de36cbed6cda2ca65 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jan 2023 13:51:57 +0100 Subject: [PATCH 2/4] python310Packages.databricks-sql-connector: add changelog to meta --- .../databricks-sql-connector/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index e698d53f433d..9c23e39c4871 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -6,6 +6,7 @@ , pyarrow , poetry-core , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -13,11 +14,13 @@ buildPythonPackage rec { version = "2.2.1"; 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-EMLUXGeVGIXFeaMvaJ+crivRZtOt7W/LCycIO2gwqXA="; }; postPatch = '' @@ -39,11 +42,18 @@ buildPythonPackage rec { 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 ]; }; From 1555f8d5340b034d76adb2dc412ee4ee05f69286 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jan 2023 15:09:26 +0100 Subject: [PATCH 3/4] python310Packages.python-lz4: 4.3.1 -> 4.3.2 Diff: https://github.com/python-lz4/python-lz4/compare/refs/tags/v4.3.1...v4.3.2 Changelog: https://github.com/python-lz4/python-lz4/releases/tag/v4.3.2 --- pkgs/development/python-modules/lz4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 041420187a94..73b03cf83cb2 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "4.3.1"; + version = "4.3.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -21,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; From 644fd982a92f6d5924f6797e6ba68dacb804c69b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Feb 2023 00:28:11 +0100 Subject: [PATCH 4/4] python310Packages.databricks-sql-connector: 2.2.1 -> 2.3.0 Diff: https://github.com/databricks/databricks-sql-python/compare/refs/tags/v2.2.1...v2.3.0 Changelog: https://github.com/databricks/databricks-sql-python/blob/v2.3.0/CHANGELOG.md --- .../databricks-sql-connector/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index 9c23e39c4871..5c01cb734d75 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -1,17 +1,21 @@ { 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"; @@ -20,22 +24,26 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "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 = [