Skip to content

Commit 91a93ae

Browse files
kongchen1992meta-codesync[bot]
authored andcommitted
{BugFix} Packaging - Ship viewer_projects and align rerun-notebook pin
Summary: Explanation: The `viewer_projects_adt`, `viewer_projects_ase` and `viewer_projects_aea` console scripts have been dead in every Gen2 wheel. Two independent packaging defects stacked: 1. The `entry_points` still pointed at `projectaria_tools.utils.viewer_projects_*`, a path left over from the Gen1 layout. In Gen2 these modules live under `projectaria_tools/tools/viewer_projects/`. `entry_points` is unvalidated metadata, so `pip` happily generated three launcher scripts that raise `ModuleNotFoundError` on the first line. 2. `projectaria_tools/tools/viewer_projects/` had no `__init__.py`, so `find_packages()` skipped it and the three modules were never placed in the wheel at all. It was the only directory under `tools/` missing the marker. Both are fixed: the entry points now resolve to `projectaria_tools.tools.viewer_projects.viewer_projects_*`, and the package marker is added so the modules ship. Separately, `rerun-notebook` was pinned to `0.26.2` while `rerun-sdk` moved to `0.33.0`. `rerun-notebook` is an optional dependency of `rerun-sdk`, exactly pinned by its `notebook` extra, and hand-copying that pin into `install_requires` gave the two packages independent version numbers that were free to drift apart. They did, and `pip` had no constraint linking them, so the mismatch resolved silently. Rather than correct the stale number, the direct `rerun-notebook` requirement is replaced by `rerun-sdk[notebook]==0.33.0`. There is now a single version to bump and the notebook widget cannot desync from the SDK again. `jupyter` is already an unconditional dependency, so this adds no weight for non-notebook users. ___ Differential Revision: D115607424 fbshipit-source-id: bf4c86777bb64f6a9f8cad5f263f3e71382ae22b
1 parent e59f0eb commit 91a93ae

3 files changed

Lines changed: 20 additions & 6 deletions

File tree

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Copyright (c) Meta Platforms, Inc. and affiliates.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
from . import * # noqa

setup.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,7 @@ def main():
189189
"pillow",
190190
"plotly",
191191
"requests",
192-
"rerun-notebook==0.26.2",
193-
"rerun-sdk==0.33.0",
192+
"rerun-sdk[notebook]==0.33.0",
194193
"scipy",
195194
"tqdm",
196195
],
@@ -200,9 +199,9 @@ def main():
200199
"dtc_object_downloader = projectaria_tools.projects.dtc_objects.downloader_main:main",
201200
"aria_rerun_viewer = projectaria_tools.tools.aria_rerun_viewer.aria_rerun_viewer:main",
202201
"viewer_mps = projectaria_tools.tools.viewer_mps.viewer_mps:main",
203-
"viewer_projects_adt = projectaria_tools.utils.viewer_projects_adt:main",
204-
"viewer_projects_ase = projectaria_tools.utils.viewer_projects_ase:main",
205-
"viewer_projects_aea = projectaria_tools.utils.viewer_projects_aea:main",
202+
"viewer_projects_adt = projectaria_tools.tools.viewer_projects.viewer_projects_adt:main",
203+
"viewer_projects_ase = projectaria_tools.tools.viewer_projects.viewer_projects_ase:main",
204+
"viewer_projects_aea = projectaria_tools.tools.viewer_projects.viewer_projects_aea:main",
206205
"vrs_to_mp4 = projectaria_tools.tools.vrs_to_mp4.vrs_to_mp4:main",
207206
"gen2_mp_csv_exporter = projectaria_tools.tools.gen2_mp_csv_exporter.run_gen2_mp_csv_exporter:main",
208207
]

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.0a2
1+
2.2.0a3

0 commit comments

Comments
 (0)