From 73719073f34c7040a4ba422fe2ab9d14361b26be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Mar 2022 18:26:30 +0100 Subject: [PATCH] python3Packages.glean-sdk: relax glean_parser constraint - Fix execution of tests - Add missing input --- .../python-modules/glean-sdk/default.nix | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index f2c2f92c9f0..8bfc7dcafed 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -1,22 +1,27 @@ { lib , buildPythonPackage -, fetchPypi -, rustPlatform -, rustc , cargo -, setuptools-rust -# build inputs , cffi +, fetchPypi , glean-parser +, iso8601 +, pytest-localserver +, pytestCheckHook +, pythonOlder +, rustc +, rustPlatform +, setuptools-rust }: buildPythonPackage rec { pname = "glean-sdk"; version = "44.0.0"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-gzLsBwq3wrFde5cEb5+oFLW4KrwoiZpr22JbJhNr1yk="; + hash = "sha256-gzLsBwq3wrFde5cEb5+oFLW4KrwoiZpr22JbJhNr1yk="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -26,22 +31,36 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - rustc cargo - setuptools-rust + rustc rustPlatform.cargoSetupHook + setuptools-rust ]; + propagatedBuildInputs = [ cffi glean-parser + iso8601 ]; - pythonImportsCheck = [ "glean" ]; + checkInputs = [ + pytest-localserver + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace glean-core/python/setup.py \ + --replace "glean_parser==5.0.1" "glean_parser>=5.0.1" + ''; + + pythonImportsCheck = [ + "glean" + ]; meta = with lib; { - description = "Modern cross-platform telemetry client libraries and are a part of the Glean project"; + description = "Telemetry client libraries and are a part of the Glean project"; homepage = "https://mozilla.github.io/glean/book/index.html"; license = licenses.mpl20; - maintainers = [ maintainers.kvark ]; + maintainers = with maintainers; [ kvark ]; }; }