Unverified Commit 62df25dc authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #327067 from mjoerg/eliot-python-3.12

parents c32a207d d7047e2f
Loading
Loading
Loading
Loading
+38 −26
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  buildPythonPackage,
  fetchPypi,
  fetchFromGitHub,
  pythonOlder,
  aiocontextvars,
  pythonAtLeast,

  setuptools,

  boltons,
  hypothesis,
  orjson,
  pyrsistent,
  zope-interface,

  daemontools,
  dask,
  distributed,
  hypothesis,
  pandas,
  pytestCheckHook,
  setuptools,
  six,
  testtools,
  zope-interface,
  twisted,
}:

buildPythonPackage rec {
  pname = "eliot";
  version = "1.14.0";
  format = "setuptools";
  version = "1.15.0";
  pyproject = true;

  disabled = pythonOlder "3.6";
  disabled = pythonOlder "3.8" || pythonAtLeast "3.13";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-wvCZo+jV7PwidFdm58xmSkjbZLa4nZht/ycEkdhoMUk=";
  src = fetchFromGitHub {
    owner = "itamarst";
    repo = "eliot";
    rev = "refs/tags/${version}";
    hash = "sha256-Ur7q7PZ5HH4ttD3b0HyBTe1B7eQ2nEWcTBR/Hjeg9yw=";
  };

  propagatedBuildInputs = [
    aiocontextvars
  build-system = [ setuptools ];

  dependencies = [
    boltons
    orjson
    pyrsistent
    setuptools
    six
    zope-interface
  ];

  nativeCheckInputs = [
    dask
    distributed
    hypothesis
    pandas
    pytestCheckHook
    testtools
  ];
    twisted
  ] ++ lib.optionals stdenv.isLinux [ daemontools ];

  __darwinAllowLocalNetworking = true;

  pythonImportsCheck = [ "eliot" ];

@@ -48,17 +65,12 @@ buildPythonPackage rec {
    export PATH=$out/bin:$PATH
  '';

  disabledTests = [
    "test_parse_stream"
    # AttributeError: module 'inspect' has no attribute 'getargspec'
    "test_default"
  ];

  meta = with lib; {
  meta = {
    homepage = "https://eliot.readthedocs.io";
    description = "Logging library that tells you why it happened";
    changelog = "https://github.com/itamarst/eliot/blob/${version}/docs/source/news.rst";
    mainProgram = "eliot-prettyprint";
    license = licenses.asl20;
    maintainers = with maintainers; [ dpausp ];
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ dpausp ];
  };
}
+27 −12
Original line number Diff line number Diff line
{ lib, python3Packages, fetchPypi }:
{
  lib,
  python3Packages,
  fetchPypi,
}:

python3Packages.buildPythonApplication rec {
  pname = "eliot-tree";
  version = "21.0.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-hTl+r+QJPPQ7ss73lty3Wm7DLy2SKGmmgIuJx38ilO8=";
  };

  nativeCheckInputs = with python3Packages; [
    testtools
    pytest
   ];
  # Patch Python 3.12 incompatibilities in versioneer.py.
  postPatch = ''
    substituteInPlace versioneer.py \
      --replace-fail SafeConfigParser ConfigParser \
      --replace-fail readfp read_file
  '';

  build-system = with python3Packages; [ setuptools ];

  propagatedBuildInputs = with python3Packages; [
  dependencies = with python3Packages; [
    colored
    eliot
    iso8601
    jmespath
    setuptools
    toolz
  ];

  nativeCheckInputs = with python3Packages; [
    pytestCheckHook
    testtools
  ];

  # Tests run eliot-tree in out/bin.
  checkPhase = ''
  preCheck = ''
    export PATH=$out/bin:$PATH
    pytest
  '';

  meta = with lib; {
  pythonImportsCheck = [ "eliottree" ];

  meta = {
    homepage = "https://github.com/jonathanj/eliottree";
    changelog = "https://github.com/jonathanj/eliottree/blob/${version}/NEWS.rst";
    description = "Render Eliot logs as an ASCII tree";
    mainProgram = "eliot-tree";
    license = licenses.mit;
    maintainers = [ maintainers.dpausp ];
    license = lib.licenses.mit;
    maintainers = [ lib.maintainers.dpausp ];
  };
}