Unverified Commit 7b38f24f authored by kirillrdy's avatar kirillrdy Committed by GitHub
Browse files

rerun: 0.24.1 -> 0.25.1 (#444377)

parents b8d99779 192a1b85

pkgs/by-name/re/rerun/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ 
}:

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "rerun";

  version = "0.24.1";

  version = "0.25.1";



  src = fetchFromGitHub {

    owner = "rerun-io";

    repo = "rerun";

    tag = finalAttrs.version;

    hash = "sha256-unPgvQcYhshdx5NGCl/pLh8UdJ9T6B8Fd0s8G1NSBmE=";

    hash = "sha256-YppVNVfVqOATLCoUvpeYYrhivKBb6f4G1JCG1Bl+cjc=";

  };



  # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 
      --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'

  '';



  cargoHash = "sha256-zdq8djnmH8srSd9sml7t6wsbxpTaT3x5/7hkDRgelbg=";

  cargoHash = "sha256-jUn7b6t5hS7KjdymxTTP8mKLT671QgKrv7R9uiOkmJU=";



  cargoBuildFlags = [ "--package rerun-cli" ];

  cargoTestFlags = [ "--package rerun-cli" ];

pkgs/development/python-modules/datafusion/default.nix

+31 −47
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  buildPythonPackage,

  fetchFromGitHub,

  rustPlatform,

  pytestCheckHook,

  libiconv,

  numpy,

  protobuf,



  # nativeBuildInputs

  protoc,



  # buildInputs

  protobuf,



  # dependencies

  pyarrow,

  typing-extensions,

  pythonOlder,

}:



let

  arrow-testing = fetchFromGitHub {

    name = "arrow-testing";

    owner = "apache";

    repo = "arrow-testing";

    rev = "4d209492d514c2d3cb2d392681b9aa00e6d8da1c";

    hash = "sha256-IkiCbuy0bWyClPZ4ZEdkEP7jFYLhM7RCuNLd6Lazd4o=";

  };



  parquet-testing = fetchFromGitHub {

    name = "parquet-testing";

    owner = "apache";

    repo = "parquet-testing";

    rev = "50af3d8ce206990d81014b1862e5ce7380dc3e08";

    hash = "sha256-edyv/r5olkj09aHtm8LHZY0b3jUtLNUcufwI41qKYaY=";

  };

in

  # tests

  numpy,

  pytest-asyncio,

  pytestCheckHook,

}:



buildPythonPackage rec {

  pname = "datafusion";

  version = "40.1.0";

  version = "48.0.0";

  pyproject = true;



  src = fetchFromGitHub {
@@ -42,13 +30,14 @@ buildPythonPackage rec { 
    owner = "apache";

    repo = "arrow-datafusion-python";

    tag = version;

    hash = "sha256-5WOSlx4XW9zO6oTY16lWQElShLv0ubflVPfSSEGrFgg=";

    # Fetch arrow-testing and parquet-testing (tests assets)

    fetchSubmodules = true;

    hash = "sha256-9IOkb31f4nFo9mWTr+z5ZG8xSXIZSgW3vCBgLaGxpfI=";

  };



  cargoDeps = rustPlatform.fetchCargoVendor {

    name = "datafusion-cargo-deps";

    inherit src;

    hash = "sha256-xUpchV4UFEX1HkCpClOwxnEfGLVlOIX4UmzYKiUth9U=";

    inherit pname src version;

    hash = "sha256-P9NFvhHAGgYIi36CHEPZPr8hmMNp5zrCcmE7NHx51k4=";

  };



  nativeBuildInputs = with rustPlatform; [
@@ -59,9 +48,6 @@ buildPythonPackage rec { 


  buildInputs = [

    protobuf

  ]

  ++ lib.optionals stdenv.hostPlatform.isDarwin [

    libiconv

  ];



  dependencies = [
@@ -70,28 +56,26 @@ buildPythonPackage rec { 
  ];



  nativeCheckInputs = [

    pytestCheckHook

    numpy

    pytest-asyncio

    pytestCheckHook

  ];



  pythonImportsCheck = [ "datafusion" ];



  pytestFlags = [

    "--pyargs"

    pname

  pythonImportsCheck = [

    "datafusion"

    "datafusion._internal"

  ];



  preCheck = ''

    pushd $TMPDIR

    ln -s ${arrow-testing} ./testing

    ln -s ${parquet-testing} ./parquet

    rm -rf python/datafusion

  '';



  postCheck = ''

    popd

  '';

  disabledTests = [

    # Exception: DataFusion error (requires internet access)

    "test_register_http_csv"

  ];



  meta = with lib; {

  meta = {

    description = "Extensible query execution framework";

    longDescription = ''

      DataFusion is an extensible query execution framework, written in Rust,
@@ -99,7 +83,7 @@ buildPythonPackage rec { 
    '';

    homepage = "https://arrow.apache.org/datafusion/";

    changelog = "https://github.com/apache/arrow-datafusion-python/blob/${version}/CHANGELOG.md";

    license = with licenses; [ asl20 ];

    maintainers = with maintainers; [ cpcloud ];

    license = with lib.licenses; [ asl20 ];

    maintainers = with lib.maintainers; [ cpcloud ];

  };

}

pkgs/development/python-modules/rerun-sdk/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
  typing-extensions,



  # tests

  datafusion,

  pytestCheckHook,

  torch,

}:
@@ -64,6 +65,7 @@ buildPythonPackage { 
  pythonImportsCheck = [ "rerun" ];



  nativeCheckInputs = [

    datafusion

    pytestCheckHook

    torch

  ];
@@ -74,6 +76,9 @@ buildPythonPackage { 
  disabledTestPaths = [

    # "fixture 'benchmark' not found"

    "tests/python/log_benchmark/test_log_benchmark.py"



    # ConnectionError: Connection error: transport error

    "rerun_py/tests/unit/test_datafusion_tables.py"

  ];



  meta = {