From ff4ec4e9223b6a29c413c34f045f56192c951fdd Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 6 May 2025 22:07:12 -0400 Subject: [PATCH 1/5] python312Packages.dbt-common: relax protobuf dependency Upstream requires protobuf<6 but we would have to downgrade protobuf for half the python world to satisfy this requirement. Signed-off-by: Ihar Hrachyshka --- pkgs/development/python-modules/dbt-common/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index 334c2bd37b558..2a447470a0bcc 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { # 0.6.x -> 0.7.2 doesn't seem too risky at a glance # https://pypi.org/project/isodate/0.7.2/ "isodate" + "protobuf" ]; dependencies = [ From 772dcd3fb64dac5b4f77c02c1da7ab6d384f06c1 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 6 May 2025 22:13:51 -0400 Subject: [PATCH 2/5] python312Packages.dbt-common: 1.22.0 -> 1.23.0 Signed-off-by: Ihar Hrachyshka --- pkgs/development/python-modules/dbt-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index 2a447470a0bcc..317dd392c9430 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "dbt-common"; - version = "1.22.0"; + version = "1.23.0"; pyproject = true; # No tags on GitHub src = fetchPypi { pname = "dbt_common"; inherit version; - hash = "sha256-6cdTMVCCB6SNEUsQtzKUBnKuJgwfttl7o2+zBp8Fu5g="; + hash = "sha256-LsczRn2rTb9RVlGpNHznHkKJht3Lke1MLVCExeneouM="; }; build-system = [ hatchling ]; From 525ac2be53c75f8a9aa75c64e1fb814f64fdbe07 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 6 May 2025 22:21:27 -0400 Subject: [PATCH 3/5] python312Packages.dbt-common: 1.23.0 -> 1.23.0-unstable-2025-04-21 Switch to github archive to have access to tests. Signed-off-by: Ihar Hrachyshka --- .../python-modules/dbt-common/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index 317dd392c9430..a277623c1c1ac 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system hatchling, @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "dbt-common"; - version = "1.23.0"; + version = "1.23.0-unstable-2025-04-21"; pyproject = true; - # No tags on GitHub - src = fetchPypi { - pname = "dbt_common"; - inherit version; - hash = "sha256-LsczRn2rTb9RVlGpNHznHkKJht3Lke1MLVCExeneouM="; + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = pname; + rev = "03e09c01f20573975e8e17776a4b7c9088b3f212"; # They don't tag releases + hash = "sha256-KqnwlFZZRYuWRflMzjrqCPBnzY9q/pPhceM2DGqz5bw="; }; build-system = [ hatchling ]; @@ -77,7 +77,6 @@ buildPythonPackage rec { "test_extra_dict_on_event" ]; - # No tests in the pypi archive doCheck = false; pythonImportsCheck = [ "dbt_common" ]; From 54c41e39182d5e05d2b9bdd4a53af9067a9f3740 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 6 May 2025 22:22:34 -0400 Subject: [PATCH 4/5] python312Packages.dbt-common: enable tests Signed-off-by: Ihar Hrachyshka --- pkgs/development/python-modules/dbt-common/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index a277623c1c1ac..678045fded22f 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -70,15 +70,6 @@ buildPythonPackage rec { pytest-mock ]; - disabledTests = [ - # Assertion errors (TODO: Notify upstream) - "test_create_print_json" - "test_events" - "test_extra_dict_on_event" - ]; - - doCheck = false; - pythonImportsCheck = [ "dbt_common" ]; meta = { From 1cd9e76546c99e0ed57df86601c234358888bf98 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 6 May 2025 23:06:52 -0400 Subject: [PATCH 5/5] python312Packages.dbt-common: disable flaky tests Signed-off-by: Ihar Hrachyshka --- pkgs/development/python-modules/dbt-common/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index 678045fded22f..6164495bd4e7f 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -70,6 +70,11 @@ buildPythonPackage rec { pytest-mock ]; + disabledTests = [ + # flaky test: https://github.com/dbt-labs/dbt-common/issues/280 + "TestFindMatching" + ]; + pythonImportsCheck = [ "dbt_common" ]; meta = {