diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 3dd835194f7a..0026548b526c 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -35,7 +35,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rerun"; - version = "0.31.4"; + version = "0.32.0"; __structuredAttrs = true; strictDeps = true; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "rerun-io"; repo = "rerun"; tag = finalAttrs.version; - hash = "sha256-gbN9aplPw+U4liGDU7Z0x+ySfxr+RlyriEkDsIA8gHA="; + hash = "sha256-Xwp2A92PD7cDMkub7znpb0MPI6xhGD/X2lnsoznvlRE="; }; # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"' ''; - cargoHash = "sha256-N5JeZMbGy9FSiluE1MAtvg97dUq3ZoUZdABwORUlWlA="; + cargoHash = "sha256-32lz+quB1i+qgiiZa7lDCzwqwFY21wECr9C0XPW+H3M="; cargoBuildFlags = [ "--package" diff --git a/pkgs/development/python-modules/rerun-notebook/default.nix b/pkgs/development/python-modules/rerun-notebook/default.nix new file mode 100644 index 000000000000..8450151d0eb0 --- /dev/null +++ b/pkgs/development/python-modules/rerun-notebook/default.nix @@ -0,0 +1,49 @@ +{ + buildPythonPackage, + rerun, + fetchPypi, + + # dependencies + anywidget, + ipykernel, + jupyter-ui-poll, +}: + +buildPythonPackage (finalAttrs: { + pname = "rerun-notebook"; + inherit (rerun) version; + format = "wheel"; + __structuredAttrs = true; + + # Building this package from source is very cumbersome (it requires a wasm web-viewer + # cross-compile via cargo + an npm/esbuild bundle). Using the upstream wheel for now. + src = fetchPypi { + pname = "rerun_notebook"; + inherit (finalAttrs) version; + format = "wheel"; + python = "py2.py3"; + hash = "sha256-GbedQku1TJTkw402el+Bc6mi4Q65Se7rf9tbSHz4kaw="; + }; + + pythonRelaxDeps = [ + # Upstream pins ipykernel<7.0.0 to dodge ipython/ipykernel#1450. + "ipykernel" + ]; + dependencies = [ + anywidget + ipykernel + jupyter-ui-poll + ]; + + pythonImportsCheck = [ "rerun_notebook" ]; + + meta = { + description = "Implementation helper for running rerun-sdk in notebooks"; + homepage = "https://github.com/rerun-io/rerun/tree/main/rerun_notebook"; + inherit (rerun.meta) + changelog + license + maintainers + ; + }; +}) diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix index 60fe41dff852..fded3aee9e80 100644 --- a/pkgs/development/python-modules/rerun-sdk/default.nix +++ b/pkgs/development/python-modules/rerun-sdk/default.nix @@ -19,13 +19,16 @@ typing-extensions, # tests + av, datafusion, inline-snapshot, polars, pytest-snapshot, pytestCheckHook, + rerun-notebook, tomli, torch, + torchvision, }: buildPythonPackage { @@ -86,13 +89,16 @@ buildPythonPackage { pythonImportsCheck = [ "rerun" ]; nativeCheckInputs = [ + av datafusion inline-snapshot polars pytest-snapshot pytestCheckHook + rerun-notebook tomli torch + torchvision ]; inherit (rerun) addDlopenRunpaths addDlopenRunpathsPhase; @@ -111,9 +117,25 @@ buildPythonPackage { # TypeError: 'Snapshot' object is not callable "test_chunk_record_batch" "test_schema_recording" + + # pytest_snapshot mismatch: serialized schema/summary output drifted in 0.32.0 + "test_schema" + "test_summary_format" + + # AttributeError: 'datetime.datetime' object has no attribute 'value' + "test_lenses_time_extraction" + + # av.InvalidDataError: the mp4 asset is a Git LFS pointer, not the real + # video (rerun.src is fetched without fetchLFS). + "test_collect_optimize_video_stream_summary" ]; disabledTestPaths = [ + # RuntimeError: MCAP error: Bad magic number. The .mcap test assets are + # Git LFS pointer files, not real binaries (rerun.src is fetched without + # fetchLFS). + "rerun_py/tests/integration/test_mcap_reader.py" + # "fixture 'benchmark' not found" "tests/python/log_benchmark/test_log_benchmark.py" "tests/python/log_benchmark/test_micro_benchmark.py" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75a1ff10b2df..2ca2ad468bde 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16983,6 +16983,8 @@ self: super: with self; { reretry = callPackage ../development/python-modules/reretry { }; + rerun-notebook = callPackage ../development/python-modules/rerun-notebook { }; + rerun-sdk = callPackage ../development/python-modules/rerun-sdk { }; resampy = callPackage ../development/python-modules/resampy { };