Skip to content

Commit 42775e3

Browse files
haixuanTaohaixuanTao
authored
Removing support for macos x86 in order to unpin macos version (dora-rs#1048)
This PR removes macOS version pinning on Maturin that makes it the prebuilt will not installable on other macOS version. I believe the original error is due to macOS x86 and I think it's time to remove support for it.
2 parents 135a451 + bdc2356 commit 42775e3

File tree

5 files changed

+13
-39
lines changed

5 files changed

+13
-39
lines changed

‎.github/workflows/node_hub_test.sh‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,6 @@ else
8989
if [ "$GITHUB_EVENT_NAME" == "release" ] || [ "$GITHUB_EVENT_NAME" == "workflow_dispatch" ]; then
9090
maturin publish --skip-existing
9191
fi
92-
93-
# x86_64-apple-darwin
94-
rustup target add x86_64-apple-darwin
95-
maturin build --target x86_64-apple-darwin --zig --release
96-
# If GITHUB_EVENT_NAME is release or workflow_dispatch, publish the wheel
97-
if [ "$GITHUB_EVENT_NAME" == "release" ] || [ "$GITHUB_EVENT_NAME" == "workflow_dispatch" ]; then
98-
maturin publish --target x86_64-apple-darwin --skip-existing --zig
99-
fi
10092

10193
elif [[ "$(uname)" = "Linux" ]] || [[ "$CI" == "false" ]]; then
10294
if [ -f "$dir/Cargo.toml" ]; then

‎.github/workflows/pip-release.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@ jobs:
192192
fail-fast: false
193193
matrix:
194194
platform:
195-
- runner: macos-13
196-
target: x86_64
197195
- runner: macos-13
198196
target: aarch64
199197
repository:

‎README.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,16 @@
7676

7777
## Support Matrix
7878

79-
| | dora-rs |
80-
| --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
81-
| **APIs** | Python >= 3.7 including sync ⭐✅ <br> Rust ✅<br> C/C++ 🆗 <br>ROS2 >= Foxy 🆗 |
82-
| **OS** | Linux: Arm 32 ⭐✅ Arm 64 ⭐✅ x64_86 ⭐✅ <br>MacOS: Arm 64 ⭐✅ x64_86 ✅<br>Windows: x64_86 🆗 <br>WSL: x64_86 🆗 <br> Android: 🛠️ (Blocked by: https://github.com/elast0ny/shared_memory/issues/32) <br> IOS: 🛠️ |
83-
| **Message Format** | Arrow ✅ <br> Standard Specification 🛠️ |
84-
| **Local Communication** | Shared Memory ✅ <br> [Cuda IPC](https://arrow.apache.org/docs/python/api/cuda.html) 📐 |
85-
| **Remote Communication** | [Zenoh](https://zenoh.io/) 📐 |
86-
| **Metrics, Tracing, and Logging** | Opentelemetry 📐 |
87-
| **Configuration** | YAML ✅ |
88-
| **Package Manager** | [pip](https://pypi.org/): Python Node ✅ Rust Node ✅ C/C++ Node 🛠️ <br>[cargo](https://crates.io/): Rust Node ✅ |
79+
| | dora-rs |
80+
| --------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
81+
| **APIs** | Python >= 3.7 including sync ⭐✅ <br> Rust ✅<br> C/C++ 🆗 <br>ROS2 >= Foxy 🆗 |
82+
| **OS** | Linux: Arm 32 ⭐✅ Arm 64 ⭐✅ x64_86 ⭐✅ <br>MacOS: Arm 64 ⭐✅ <br>Windows: x64_86 🆗 <br>WSL: x64_86 🆗 <br> Android: 🛠️ (Blocked by: https://github.com/elast0ny/shared_memory/issues/32) <br> IOS: 🛠️ |
83+
| **Message Format** | Arrow ✅ <br> Standard Specification 🛠️ |
84+
| **Local Communication** | Shared Memory ✅ <br> [Cuda IPC](https://arrow.apache.org/docs/python/api/cuda.html) 📐 |
85+
| **Remote Communication** | [Zenoh](https://zenoh.io/) 📐 |
86+
| **Metrics, Tracing, and Logging** | Opentelemetry 📐 |
87+
| **Configuration** | YAML ✅ |
88+
| **Package Manager** | [pip](https://pypi.org/): Python Node ✅ Rust Node ✅ C/C++ Node 🛠️ <br>[cargo](https://crates.io/): Rust Node ✅ |
8989

9090
> - ⭐ = Recommended
9191
> - ✅ = First Class Support
@@ -104,8 +104,8 @@
104104
| Camera | [PyOrbbeckSDK](https://github.com/dora-rs/dora/blob/main/node-hub/dora-pyorbbecksdk) | 📐 | Image and depth from Orbbeck Camera | ![Downloads](https://img.shields.io/pypi/dm/dora-pyorbbecksdk?label=%20) | ![License](https://img.shields.io/pypi/l/dora-pyorbbecksdk?label=%20) |
105105
| Camera | [PyRealsense](https://github.com/dora-rs/dora/blob/main/node-hub/dora-pyrealsense) | Linux🆗 <br> Mac🛠️ | Image and depth from Realsense | ![Downloads](https://img.shields.io/pypi/dm/dora-pyrealsense?label=%20) | ![License](https://img.shields.io/pypi/l/dora-pyrealsense?label=%20) |
106106
| Camera | [OpenCV Video Capture](https://github.com/dora-rs/dora/blob/main/node-hub/opencv-video-capture) | ✅ | Image stream from OpenCV Camera | ![Downloads](https://img.shields.io/pypi/dm/opencv-video-capture?label=%20) | ![License](https://img.shields.io/pypi/l/opencv-video-capture?label=%20) |
107-
| Camera | [Kornia V4L Capture](https://github.com/kornia/dora-nodes-hub/tree/main/kornia-v4l-capture) | ✅ | Video stream for Linux Camera (rust) | | ![License](https://img.shields.io/badge/license-Apache%202-blue) |
108-
| Camera | [Kornia GST Capture](https://github.com/kornia/dora-nodes-hub/tree/main/kornia-gst-capture) | ✅ | Video Capture using Gstreamer (rust) | | ![License](https://img.shields.io/badge/license-Apache%202-blue) |
107+
| Camera | [Kornia V4L Capture](https://github.com/kornia/dora-nodes-hub/tree/main/kornia-v4l-capture) | ✅ | Video stream for Linux Camera (rust) | | ![License](https://img.shields.io/badge/license-Apache%202-blue) |
108+
| Camera | [Kornia GST Capture](https://github.com/kornia/dora-nodes-hub/tree/main/kornia-gst-capture) | ✅ | Video Capture using Gstreamer (rust) | | ![License](https://img.shields.io/badge/license-Apache%202-blue) |
109109
| Peripheral | [Keyboard](https://github.com/dora-rs/dora/blob/main/node-hub/dora-keyboard) | ✅ | Keyboard char listener | ![Downloads](https://img.shields.io/pypi/dm/dora-keyboard?label=%20) | ![License](https://img.shields.io/pypi/l/dora-keyboard?label=%20) |
110110
| Peripheral | [Microphone](https://github.com/dora-rs/dora/blob/main/node-hub/dora-microphone) | ✅ | Audio from microphone | ![Downloads](https://img.shields.io/pypi/dm/dora-microphone?label=%20) | ![License](https://img.shields.io/pypi/l/dora-microphone?label=%20) |
111111
| Peripheral | [PyAudio(Speaker)](https://github.com/dora-rs/dora/blob/main/node-hub/dora-pyaudio) | ✅ | Output audio from speaker | ![Downloads](https://img.shields.io/pypi/dm/dora-pyaudio?label=%20) | ![License](https://img.shields.io/pypi/l/dora-pyaudio?label=%20) |
@@ -138,7 +138,7 @@
138138
| Simulator | [Mujoco](https://github.com/dora-rs/dora-lerobot/blob/main/node-hub/mujoco-client) | 📐 | Mujoco Simulator | | |
139139
| Simulator | [Carla](https://github.com/dora-rs/dora-drives) | 📐 | Carla Simulator | | |
140140
| Simulator | [Gymnasium](https://github.com/dora-rs/dora-lerobot/blob/main/gym_dora) | 📐 | Experimental OpenAI Gymnasium bridge | | |
141-
| Image Processing | [Kornia Sobel Operator](https://github.com/kornia/dora-nodes-hub/tree/main/kornia-imgproc-sobel) | ✅ | Kornia image processing Sobel operator (rust) | | ![License](https://img.shields.io/badge/license-Apache%202-blue) |
141+
| Image Processing | [Kornia Sobel Operator](https://github.com/kornia/dora-nodes-hub/tree/main/kornia-imgproc-sobel) | ✅ | Kornia image processing Sobel operator (rust) | | ![License](https://img.shields.io/badge/license-Apache%202-blue) |
142142

143143
## Examples
144144

‎apis/python/node/pyproject.toml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,3 @@ extend-select = [
2222
"D", # pydocstyle
2323
"UP",
2424
]
25-
26-
[tool.maturin.target.x86_64-apple-darwin]
27-
# macOS deployment target SDK version
28-
macos-deployment-target = "14.5"
29-
30-
[tool.maturin.target.aarch64-apple-darwin]
31-
# macOS deployment target SDK version
32-
macos-deployment-target = "14.5"

‎binaries/cli/pyproject.toml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,3 @@ extend-select = [
1818
"D", # pydocstyle
1919
"UP",
2020
]
21-
22-
[tool.maturin.target.x86_64-apple-darwin]
23-
# macOS deployment target SDK version
24-
macos-deployment-target = "14.5"
25-
26-
[tool.maturin.target.aarch64-apple-darwin]
27-
# macOS deployment target SDK version
28-
macos-deployment-target = "14.5"

0 commit comments

Comments
 (0)