Skip to content

Commit 475aa64

Browse files
grtlrjprochazk
authored andcommitted
Remove remote feature from pypi definitions (#9252)
Title.
1 parent 657f254 commit 475aa64

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

rerun_py/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extra = []
2222

2323
## The features we turn on when building the `rerun-sdk` PyPi package
2424
## for <https://pypi.org/project/rerun-sdk/>.
25-
pypi = ["extension-module", "nasm", "web_viewer", "remote"]
25+
pypi = ["extension-module", "nasm", "web_viewer"]
2626

2727
## We need to enable the `pyo3/extension-module` when building the SDK,
2828
## but we cannot enable it when building tests and benchmarks, so we

rerun_py/src/dataframe.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ use re_log_types::{EntityPathFilter, ResolvedTimeRange};
3030
use re_sdk::{ComponentName, EntityPath, StoreId, StoreKind};
3131
use re_sorbet::SorbetColumnDescriptors;
3232

33-
#[cfg(feature = "remote")]
3433
use crate::remote::PyRemoteRecording;
3534

3635
/// Register the `rerun.dataframe` module.
@@ -575,7 +574,6 @@ pub struct PyRecording {
575574
#[derive(Clone)]
576575
pub enum PyRecordingHandle {
577576
Local(std::sync::Arc<Py<PyRecording>>),
578-
#[cfg(feature = "remote")]
579577
Remote(std::sync::Arc<Py<PyRemoteRecording>>),
580578
}
581579

@@ -648,7 +646,6 @@ impl PyRecordingView {
648646
/// This schema will only contain the columns that are included in the view via
649647
/// the view contents.
650648
fn schema(&self, py: Python<'_>) -> PyResult<PySchema> {
651-
#![allow(clippy::unnecessary_wraps)] // In case of feature != "remote"
652649
match &self.recording {
653650
PyRecordingHandle::Local(recording) => {
654651
let borrowed: PyRef<'_, PyRecording> = recording.borrow(py);
@@ -663,7 +660,6 @@ impl PyRecordingView {
663660
schema: query_handle.view_contents().clone(),
664661
})
665662
}
666-
#[cfg(feature = "remote")]
667663
PyRecordingHandle::Remote(_) => Err::<_, PyErr>(PyRuntimeError::new_err(
668664
"Schema is not implemented for remote recordings yet.",
669665
)),
@@ -751,7 +747,6 @@ impl PyRecordingView {
751747
RecordBatchIterator::new(query_handle.into_batch_iter().map(Ok), schema);
752748
Ok(PyArrowType(Box::new(reader)))
753749
}
754-
#[cfg(feature = "remote")]
755750
PyRecordingHandle::Remote(recording) => {
756751
let borrowed_recording = recording.borrow(py);
757752
let mut borrowed_client = borrowed_recording.client.borrow_mut(py);
@@ -842,7 +837,6 @@ impl PyRecordingView {
842837

843838
Ok(PyArrowType(Box::new(reader)))
844839
}
845-
#[cfg(feature = "remote")]
846840
PyRecordingHandle::Remote(recording) => {
847841
let borrowed_recording = recording.borrow(py);
848842
let mut borrowed_client = borrowed_recording.client.borrow_mut(py);

rerun_py/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,5 @@ static GLOBAL: AccountingAllocator<mimalloc::MiMalloc> =
1616
mod arrow;
1717
mod dataframe;
1818
mod python_bridge;
19-
mod video;
20-
21-
#[cfg(feature = "remote")]
2219
mod remote;
20+
mod video;

rerun_py/src/python_bridge.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ fn rerun_bindings(_py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
183183
// dataframes
184184
crate::dataframe::register(m)?;
185185

186-
#[cfg(feature = "remote")]
186+
// remote
187187
crate::remote::register(m)?;
188188

189189
Ok(())

0 commit comments

Comments
 (0)