From 37ee0898552f2ad510fdc24ad99b79c3f65f8968 Mon Sep 17 00:00:00 2001 From: dpausp Date: Sun, 31 May 2020 20:52:53 +0000 Subject: [PATCH] eliot-tree: init at 19.0.1 dependencies: * eliot: init at 1.12.0 --- maintainers/maintainer-list.nix | 10 ++++ .../python-modules/eliot/default.nix | 56 +++++++++++++++++++ pkgs/development/tools/eliot-tree/default.nix | 38 +++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 5 files changed, 108 insertions(+) create mode 100644 pkgs/development/python-modules/eliot/default.nix create mode 100644 pkgs/development/tools/eliot-tree/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index acce135aa2e..22db8c5e3ba 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2170,6 +2170,16 @@ githubId = 974130; name = "David Pätzel"; }; + dpausp = { + email = "dpausp@posteo.de"; + github = "dpausp"; + githubId = 1965950; + name = "Tobias Stenzel"; + keys = [{ + longkeyid = "rsa2048/0x78C7DD40DF23FB16"; + fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16"; + }]; + }; dpflug = { email = "david@pflug.email"; github = "dpflug"; diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix new file mode 100644 index 00000000000..557be014f86 --- /dev/null +++ b/pkgs/development/python-modules/eliot/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, aiocontextvars +, boltons +, hypothesis +, pyrsistent +, pytest +, setuptools +, six +, testtools +, zope_interface +}: + +buildPythonPackage rec { + pname = "eliot"; + version = "1.12.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wabv7hk63l12881f4zw02mmj06583qsx2im0yywdjlj8f56vqdn"; + }; + + checkInputs = [ + hypothesis + testtools + pytest + ]; + + propagatedBuildInputs = [ + aiocontextvars + boltons + pyrsistent + setuptools + six + zope_interface + ]; + + pythonImportsCheck = [ "eliot" ]; + + # Tests run eliot-prettyprint in out/bin. + # test_parse_stream is broken, skip it. + checkPhase = '' + export PATH=$out/bin:$PATH + pytest -k 'not test_parse_stream' + ''; + + meta = with stdenv.lib; { + homepage = "https://eliot.readthedocs.io"; + description = "Logging library that tells you why it happened"; + license = licenses.asl20; + maintainers = [ maintainers.dpausp ]; + }; +} diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/development/tools/eliot-tree/default.nix new file mode 100644 index 00000000000..95108c21bb9 --- /dev/null +++ b/pkgs/development/tools/eliot-tree/default.nix @@ -0,0 +1,38 @@ +{ stdenv, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "eliot-tree"; + version = "19.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "18gvijsm0vh3x83mv8dd80c3mpm80r7i111qsg4y7rj4i590phma"; + }; + + checkInputs = with python3Packages; [ + testtools + pytest + ]; + + propagatedBuildInputs = with python3Packages; [ + colored + eliot + iso8601 + jmespath + setuptools + toolz + ]; + + # Tests run eliot-tree in out/bin. + checkPhase = '' + export PATH=$out/bin:$PATH + pytest + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/jonathanj/eliottree"; + description = "Render Eliot logs as an ASCII tree"; + license = licenses.mit; + maintainers = [ maintainers.dpausp ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6d406907ac..604c597c7f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10614,6 +10614,8 @@ in elfutils = callPackage ../development/tools/misc/elfutils { }; + eliot-tree = callPackage ../development/tools/eliot-tree { }; + emma = callPackage ../development/tools/analysis/emma { }; epm = callPackage ../development/tools/misc/epm { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa0a2d6d8ff..911f9b674f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -728,6 +728,8 @@ in { diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; + eliot = callPackage ../development/python-modules/eliot {}; + entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; }; entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; };