Skip to content

Commit

Permalink
Move re_video from crates/store to crates/utils (#8260)
Browse files Browse the repository at this point in the history
### Related
* Closes #7842 

<!--
Include links to any related issues/PRs in a bulleted list, for example:
* Closes #1234
* Part of #1337
-->

### What
Simply migrates `re_video` from `store` to `utils`, and accordingly
updates `Cargo.toml`.

#### Passes:
- `cargo test --all-targets --all-features`
- `pixi run -e cpp cpp-test`

#### Fails:
- `pixi run py-test`
```
rerun_py/rerun_sdk/rerun/datatypes/angle.py:12: in <module>
    import pyarrow as pa
.pixi/envs/py/lib/python3.11/site-packages/pyarrow/__init__.py:65: in <module>
    import pyarrow.lib as _lib
E   ImportError: /usr/lib/x86_64-linux-gnu/libstdc++.so.6: version `GLIBCXX_3.4.32' not found (required by /home/abhishek/Code/rerun/.pixi/envs/py/lib/python3.11/site-packages/pyarrow/../../../libarrow.so.1800)
```
I'm on Ubuntu 22.04 and have got ROS2 which may be causing conflicts as
I see `.pixi/envs/py/lib/python3.11` mixed up with
`/opt/ros/humble/lib/python3.10`:
<details>
  <summary>Console Logs</summary>

  ```
$ pixi run py-test
✨ Pixi task (py-build in py): pixi run -e py py-build-common
✨ Pixi task (rerun-build in py): cargo build --package rerun-cli
--no-default-features --features map_view,nasm,native_viewer
    Finished `dev` profile [optimized + debuginfo] target(s) in 0.34s

✨ Pixi task (py-build-common in py): PIP_REQUIRE_VIRTUALENV=0
RERUN_ALLOW_MISSING_BIN=1 maturin develop --manifest-path
rerun_py/Cargo.toml --extras=tests
🍹 Building a mixed python/rust project
🔗 Found pyo3 bindings with abi3 support for Python ≥ 3.8
🐍 Not using a specific python interpreter
📡 Using build options locked, config from pyproject.toml
Ignoring rerun-notebook: markers 'extra == "notebook"' don't match your
environment
Requirement already satisfied: attrs>=23.1.0 in
./.pixi/envs/py/lib/python3.11/site-packages (24.2.0)
Requirement already satisfied: numpy<2,>=1.23 in
./.pixi/envs/py/lib/python3.11/site-packages (1.26.4)
Requirement already satisfied: pillow>=8.0.0 in
./.pixi/envs/py/lib/python3.11/site-packages (10.0.0)
Requirement already satisfied: pyarrow>=14.0.2 in
./.pixi/envs/py/lib/python3.11/site-packages (18.0.0)
Requirement already satisfied: typing-extensions>=4.5 in
./.pixi/envs/py/lib/python3.11/site-packages (4.12.2)
Requirement already satisfied: pytest==7.1.2 in
./.pixi/envs/py/lib/python3.11/site-packages (7.1.2)
Requirement already satisfied: iniconfig in
./.pixi/envs/py/lib/python3.11/site-packages (from pytest==7.1.2)
(2.0.0)
Requirement already satisfied: packaging in
./.pixi/envs/py/lib/python3.11/site-packages (from pytest==7.1.2) (24.1)
Requirement already satisfied: pluggy<2.0,>=0.12 in
./.pixi/envs/py/lib/python3.11/site-packages (from pytest==7.1.2)
(1.5.0)
Requirement already satisfied: py>=1.8.2 in
./.pixi/envs/py/lib/python3.11/site-packages (from pytest==7.1.2)
(1.11.0)
Requirement already satisfied: tomli>=1.0.0 in
./.pixi/envs/py/lib/python3.11/site-packages (from pytest==7.1.2)
(2.0.2)
    Finished `dev` profile [optimized + debuginfo] target(s) in 0.24s
📦 Built wheel for abi3 Python ≥ 3.8 to
/tmp/.tmpBFVm0m/rerun_sdk-0.21.0a1+dev-cp38-abi3-linux_x86_64.whl
✏️  Setting installed package as editable
🛠 Installed rerun-sdk-0.21.0a1+dev

✨ Pixi task (py-test in py): python -m pytest -vv rerun_py/tests/unit
=======================================================================
test session starts
=======================================================================
platform linux -- Python 3.11.10, pytest-7.1.2, pluggy-1.5.0 --
/home/abhishek/Code/rerun/.pixi/envs/py/bin/python
cachedir: .pytest_cache
benchmark: 4.0.0 (defaults: timer=time.perf_counter disable_gc=False
min_rounds=5 min_time=0.000005 max_time=1.0 calibration_precision=10
warmup=False warmup_iterations=100000)
rootdir: /home/abhishek/Code/rerun/rerun_py, configfile: pyproject.toml
plugins: ament-xmllint-0.12.11, ament-lint-0.12.11,
ament-copyright-0.12.11, launch-pytest-1.0.6, launch-testing-ros-0.19.7,
ament-flake8-0.12.11, ament-pep257-0.12.11, launch-testing-1.0.6,
benchmark-4.0.0, anyio-4.6.2.post1
collected 0 items / 1 error


=============================================================================
ERRORS
==============================================================================
_____________________________________________________________ ERROR
collecting tests/unit/__init__.py
_____________________________________________________________
.pixi/envs/py/lib/python3.11/site-packages/pluggy/_hooks.py:513: in
__call__
return self._hookexec(self.name, self._hookimpls.copy(), kwargs,
firstresult)
.pixi/envs/py/lib/python3.11/site-packages/pluggy/_manager.py:120: in
_hookexec
    return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
.pixi/envs/py/lib/python3.11/site-packages/_pytest/python.py:206: in
pytest_collect_file
    module: Module = ihook.pytest_pycollect_makemodule(
.pixi/envs/py/lib/python3.11/site-packages/_pytest/config/compat.py:67:
in fixed_hook
    return hook(**kw)
.pixi/envs/py/lib/python3.11/site-packages/pluggy/_hooks.py:513: in
__call__
return self._hookexec(self.name, self._hookimpls.copy(), kwargs,
firstresult)
.pixi/envs/py/lib/python3.11/site-packages/pluggy/_manager.py:120: in
_hookexec
    return self._inner_hookexec(hook_name, methods, kwargs, firstresult)

/opt/ros/humble/lib/python3.10/site-packages/launch_testing/pytest/hooks.py:193:
in pytest_pycollect_makemodule
    entrypoint = find_launch_test_entrypoint(path)

/opt/ros/humble/lib/python3.10/site-packages/launch_testing/pytest/hooks.py:183:
in find_launch_test_entrypoint
    module = import_path(path, root=None)
.pixi/envs/py/lib/python3.11/site-packages/_pytest/pathlib.py:533: in
import_path
    importlib.import_module(module_name)
.pixi/envs/py/lib/python3.11/importlib/__init__.py:126: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
<frozen importlib._bootstrap>:1204: in _gcd_import
    ???
<frozen importlib._bootstrap>:1176: in _find_and_load
    ???
<frozen importlib._bootstrap>:1147: in _find_and_load_unlocked
    ???
<frozen importlib._bootstrap>:690: in _load_unlocked
    ???

.pixi/envs/py/lib/python3.11/site-packages/_pytest/assertion/rewrite.py:168:
in exec_module
    exec(co, module.__dict__)
rerun_py/tests/unit/test_annotation_context.py:6: in <module>
    import rerun as rr
rerun_py/rerun/__init__.py:36: in <module>
    sys.modules["rerun"] = __import__("rerun")
rerun_py/rerun_sdk/rerun/__init__.py:28: in <module>
    from . import (
rerun_py/rerun_sdk/rerun/blueprint/__init__.py:7: in <module>
from ..datatypes import ( # Re-export time range types for better
discoverability.
rerun_py/rerun_sdk/rerun/datatypes/__init__.py:5: in <module>
    from .angle import Angle, AngleArrayLike, AngleBatch, AngleLike
rerun_py/rerun_sdk/rerun/datatypes/angle.py:12: in <module>
    import pyarrow as pa
.pixi/envs/py/lib/python3.11/site-packages/pyarrow/__init__.py:65: in
<module>
    import pyarrow.lib as _lib
E ImportError: /usr/lib/x86_64-linux-gnu/libstdc++.so.6: version
`GLIBCXX_3.4.32' not found (required by
/home/abhishek/Code/rerun/.pixi/envs/py/lib/python3.11/site-packages/pyarrow/../../../libarrow.so.1800)

-------------------------------------------------------------------------
Captured stderr
-------------------------------------------------------------------------
DEV ENVIRONMENT DETECTED! Re-importing rerun from:
/home/abhishek/Code/rerun/rerun_py/rerun_sdk
=====================================================================
short test summary info
=====================================================================
ERROR rerun_py/tests/unit/__init__.py - ImportError:
/usr/lib/x86_64-linux-gnu/libstdc++.so.6: version `GLIBCXX_3.4.32' not
found (required by /home/abhishek/Co...
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Interrupted: 1 error during collection
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

========================================================================
1 error in 0.20s
=========================================================================
  ```
</details>

<!--
Make sure the PR title and labels are set to maximize their usefulness
for the CHANGELOG,
and our `git log`.

If you have noticed any breaking changes, include them in the migration
guide.

We track various metrics at <https://build.rerun.io>.

For maintainers:
* To run all checks from `main`, comment on the PR with `@rerun-bot
full-check`.
* To deploy documentation changes immediately after merging this PR, add
the `deploy docs` label.
-->
  • Loading branch information
abhishek47kashyap authored Dec 6, 2024
1 parent 0bd35e6 commit 2cfe825
Show file tree
Hide file tree
Showing 19 changed files with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ re_sdk_comms = { path = "crates/store/re_sdk_comms", version = "=0.21.0-alpha.1"
re_types = { path = "crates/store/re_types", version = "=0.21.0-alpha.1", default-features = false }
re_types_blueprint = { path = "crates/store/re_types_blueprint", version = "=0.21.0-alpha.1", default-features = false }
re_types_core = { path = "crates/store/re_types_core", version = "=0.21.0-alpha.1", default-features = false }
re_video = { path = "crates/store/re_video", version = "=0.21.0-alpha.1", default-features = false }
re_ws_comms = { path = "crates/store/re_ws_comms", version = "=0.21.0-alpha.1", default-features = false }

# crates/top:
Expand All @@ -85,6 +84,7 @@ re_smart_channel = { path = "crates/utils/re_smart_channel", version = "=0.21.0-
re_string_interner = { path = "crates/utils/re_string_interner", version = "=0.21.0-alpha.1", default-features = false }
re_tracing = { path = "crates/utils/re_tracing", version = "=0.21.0-alpha.1", default-features = false }
re_tuid = { path = "crates/utils/re_tuid", version = "=0.21.0-alpha.1", default-features = false }
re_video = { path = "crates/utils/re_video", version = "=0.21.0-alpha.1", default-features = false }

# crates/viewer:
re_blueprint_tree = { path = "crates/viewer/re_blueprint_tree", version = "=0.21.0-alpha.1", default-features = false }
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 2cfe825

Please sign in to comment.