Skip to content

Commit

Permalink
Merge pull request #89271 from dpausp/eliot-tree
Browse files Browse the repository at this point in the history
eliot-tree: init at 19.0.1
  • Loading branch information
Christian Kauhaus committed Aug 5, 2020
2 parents 72c9b56 + 37ee089 commit 3d20d83
Show file tree
Hide file tree
Showing 5 changed files with 108 additions and 0 deletions.
10 changes: 10 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2180,6 +2180,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";
Expand Down
56 changes: 56 additions & 0 deletions pkgs/development/python-modules/eliot/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
38 changes: 38 additions & 0 deletions pkgs/development/tools/eliot-tree/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10623,6 +10623,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 { };
Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,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; };
Expand Down

0 comments on commit 3d20d83

Please sign in to comment.