From e5a2d548ffbbfce56effdfd3a042e04bec177c11 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Oct 2024 13:39:00 +0300 Subject: [PATCH] python312Packages.dbt-common: 1.8.0 -> 1.11.0 Not yet fully building, but with a Python package set that uses protobuf4 instead of protobuf5, it is working. --- .../python-modules/dbt-common/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index f3bb688e2189..9b037341b490 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -1,6 +1,6 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, pythonOlder, @@ -25,19 +25,24 @@ pytestCheckHook, pytest-mock, pytest-xdist, + numpy, }: buildPythonPackage rec { pname = "dbt-common"; - version = "1.8.0"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "dbt_common"; - inherit version; - hash = "sha256-ehZ+a3zznnWMY9NJx9LfRtkV1vHiIH0HEhsYWfMbmb4="; + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = "dbt-common"; + # Unfortunatly, upstream doesn't tag commits on GitHub, and the pypi source + # doesn't include tests. TODO: Write an update script that will detect the + # version from `dbt_common/__about__.py`. + rev = "ed11c6ceb4f29d4a79489469309d9ce9dd1757e6"; + hash = "sha256-JA6hFQwF7h1tXyCxBVKGgyevdTxyYeN3I/Bwy9uoC0Y="; }; build-system = [ @@ -47,6 +52,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "protobuf" "agate" + "deepdiff" ]; dependencies = [ @@ -64,15 +70,17 @@ buildPythonPackage rec { typing-extensions ] ++ mashumaro.optional-dependencies.msgpack; - # Upstream stopped to tag the source fo rnow - doCheck = false; - nativeCheckInputs = [ pytestCheckHook pytest-xdist pytest-mock ]; - + disabledTests = [ + # Assertion errors (TODO: Notify upstream) + "test_create_print_json" + "test_events" + "test_extra_dict_on_event" + ]; pythonImportsCheck = [ "dbt_common" ]; meta = {