pixi-ros 0.1.2__tar.gz → 0.3.0__tar.gz

{pixi_ros-0.1.2 → pixi_ros-0.3.0}/.github/workflows/ci.yml

@@ -1,3 +1,5 @@
+name: CI 
+
 on:
   push:
   pull_request:

{pixi_ros-0.1.2 → pixi_ros-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pixi-ros
-Version: 0.1.2
+Version: 0.3.0
 Summary: Pixi extension for ROS package management
 Project-URL: Homepage, https://github.com/ruben-arts/pixi-ros
 Project-URL: Repository, https://github.com/ruben-arts/pixi-ros
@@ -90,13 +90,16 @@ pixi shell
 
 ### Dependency Mapping
 
-`pixi-ros` reads all dependency types from `package.xml` files. 
+`pixi-ros` reads all dependency types from `package.xml` files.
 It then does a best effort mapping of ROS package names to conda packages.
 
 - **ROS packages**: `ros-{distro}-{package}` from robostack channels (e.g., `ros-humble-rclcpp`)
 - **System packages**: Mapped to conda-forge equivalents (e.g., `cmake`, `eigen`)
+- **Platform-specific packages**: Different mappings per platform (e.g., OpenGL → `libgl-devel` on Linux, X11 packages on macOS)
 
-After the mapping, it validates package availability in the configured channels. This starts a connection with `https://prefix.dev` to check if packages exist.
+The mapping rules are defined in YAML files (see `src/pixi_ros/data/conda-forge.yaml`) and can be customized by placing your own mapping files in `pixi-ros/*.yaml` or `~/.pixi-ros/*.yaml`.
+
+After the mapping, it validates package availability in the configured channels for each target platform. This starts a connection with `https://prefix.dev` to check if packages exist.
 
 ### Example
 
@@ -117,6 +120,41 @@ ros-humble-rclcpp = "*"
 ros-humble-std-msgs = "*"
 ```
 
+### Version Constraints
+
+`pixi-ros` supports version constraints from `package.xml` files and automatically applies them to the generated `pixi.toml`.
+
+#### Supported Version Attributes
+
+You can specify version requirements in your `package.xml` using standard ROS version attributes:
+
+| package.xml attribute | pixi.toml constraint | Description |
+|----------------------|----------------------|-------------|
+| `version_eq="X.Y.Z"` | `==X.Y.Z` | Exactly version X.Y.Z |
+| `version_gte="X.Y.Z"` | `>=X.Y.Z` | Version X.Y.Z or newer |
+| `version_gt="X.Y.Z"` | `>X.Y.Z` | Newer than version X.Y.Z |
+| `version_lte="X.Y.Z"` | `<=X.Y.Z` | Version X.Y.Z or older |
+| `version_lt="X.Y.Z"` | `<X.Y.Z` | Older than version X.Y.Z |
+
+Multiple constraints can be combined on the same dependency and will be joined with commas in the output.
+
+Given a `package.xml` with version constraints:
+
+```xml
+<depend version_gte="3.12.4">cmake</depend>
+<build_depend version_gte="3.3.0" version_lt="4.0.0">eigen</build_depend>
+<exec_depend version_eq="1.2.3">boost</exec_depend>
+```
+
+`pixi-ros init` generates:
+
+```toml
+[dependencies]
+cmake = ">=3.12.4"
+eigen = ">=3.3.0,<4.0.0"
+boost = "==1.2.3"
+```
+
 ## Supported ROS Distributions
 
 - ROS 2 Humble: https://prefix.dev/robostack-humble
@@ -132,24 +170,102 @@ Initialize or update a ROS workspace's `pixi.toml`.
 
 ```bash
 pixi-ros init --distro <ros_distro>
+pixi-ros init --distro humble --platform linux-64 --platform osx-arm64
 pixi-ros init
 ```
 
 **Options:**
-- `--distro`, `-d`: ROS distribution (optional)
+- `--distro`, `-d`: ROS distribution (optional, will prompt if not provided)
+- `--platform`, `-p`: Target platforms (optional, can be specified multiple times, will prompt if not provided)
+  - Available: `linux-64`, `osx-64`, `osx-arm64`, `win-64`
+  - Platforms come from the mapping files and determine which dependencies are available
 
 **What it does:**
 - Scans workspace for `package.xml` files
-- Reads all dependency types (build, exec, test)
-- Maps ROS dependencies to conda packages
+- Reads all dependency types (build, exec, test) and version constraints
+- Maps ROS dependencies to conda packages for each platform
+- Applies version constraints from package.xml to pixi.toml dependencies
 - Configures robostack channels
-- Checks package availability
+- Checks package availability per platform
 - Creates build tasks using colcon
 - Generates helpful `README_PIXI.md`
+- Sets up platform-specific dependencies in `pixi.toml`
 
 **Running multiple times:**
 The command is idempotent - you can run it multiple times to update dependencies as your workspace changes.
 
+## Multi-Platform Support
+
+`pixi-ros` supports generating cross-platform configurations. When you specify multiple platforms, it:
+
+1. **Analyzes dependencies per platform**: Some packages have platform-specific mappings (e.g., OpenGL requirements differ between Linux and macOS)
+
+2. **Organizes dependencies intelligently**:
+   - **Common dependencies** (available on all platforms) → `[dependencies]`
+   - **Unix dependencies** (available on Linux and macOS, but not Windows) → `[target.unix.dependencies]`
+   - **Platform-specific dependencies** → `[target.linux.dependencies]`, `[target.osx.dependencies]`, etc.
+
+3. **Sets up correct platform list**: The `[workspace]` section gets the appropriate pixi platform names
+
+### Platform Naming
+
+pixi-ros uses standard pixi platform names:
+- `linux-64` - Linux x86_64
+- `osx-64` - macOS Intel
+- `osx-arm64` - macOS Apple Silicon (M1/M2/M3)
+- `win-64` - Windows x86_64
+
+Internally, mapping files use a simplified format (`linux`, `osx`, `win64`), but this is transparent to users. When you specify `osx-64` and `osx-arm64`, they both use the same `osx` mapping rules since package availability is typically the same for both architectures.
+
+### Example: Multi-Platform Setup
+
+```bash
+pixi-ros init --distro humble --platform linux-64 --platform osx-arm64
+```
+
+Generates:
+
+```toml
+[workspace]
+name = "my_workspace"
+channels = [
+    "https://prefix.dev/robostack-humble",
+    "https://prefix.dev/conda-forge",
+]
+platforms = ["linux-64", "osx-arm64"]
+
+[dependencies]
+# Common dependencies (available on all platforms)
+ros-humble-rclcpp = "*"
+ros-humble-std-msgs = "*"
+
+[target.unix.dependencies]
+# Unix-specific dependencies (Linux and macOS)
+xorg-libx11 = "*"
+xorg-libxext = "*"
+
+[target.linux.dependencies]
+# Linux-specific dependencies
+libgl-devel = "*"
+libopengl-devel = "*"
+```
+
+### Interactive Platform Selection
+
+If you don't specify platforms, you'll be prompted:
+
+```bash
+$ pixi-ros init --distro humble
+
+Available target platforms:
+  1. linux-64
+  2. osx-64
+  3. osx-arm64
+  4. win-64
+
+Select platforms (enter numbers or names, comma or space separated): 1 3
+```
+
 ## Philosophy
 
 `pixi-ros` aims to be a quick **gateway drug**. It:

{pixi_ros-0.1.2 → pixi_ros-0.3.0}/README.md

@@ -71,13 +71,16 @@ pixi shell
 
 ### Dependency Mapping
 
-`pixi-ros` reads all dependency types from `package.xml` files. 
+`pixi-ros` reads all dependency types from `package.xml` files.
 It then does a best effort mapping of ROS package names to conda packages.
 
 - **ROS packages**: `ros-{distro}-{package}` from robostack channels (e.g., `ros-humble-rclcpp`)
 - **System packages**: Mapped to conda-forge equivalents (e.g., `cmake`, `eigen`)
+- **Platform-specific packages**: Different mappings per platform (e.g., OpenGL → `libgl-devel` on Linux, X11 packages on macOS)
 
-After the mapping, it validates package availability in the configured channels. This starts a connection with `https://prefix.dev` to check if packages exist.
+The mapping rules are defined in YAML files (see `src/pixi_ros/data/conda-forge.yaml`) and can be customized by placing your own mapping files in `pixi-ros/*.yaml` or `~/.pixi-ros/*.yaml`.
+
+After the mapping, it validates package availability in the configured channels for each target platform. This starts a connection with `https://prefix.dev` to check if packages exist.
 
 ### Example
 
@@ -98,6 +101,41 @@ ros-humble-rclcpp = "*"
 ros-humble-std-msgs = "*"
 ```
 
+### Version Constraints
+
+`pixi-ros` supports version constraints from `package.xml` files and automatically applies them to the generated `pixi.toml`.
+
+#### Supported Version Attributes
+
+You can specify version requirements in your `package.xml` using standard ROS version attributes:
+
+| package.xml attribute | pixi.toml constraint | Description |
+|----------------------|----------------------|-------------|
+| `version_eq="X.Y.Z"` | `==X.Y.Z` | Exactly version X.Y.Z |
+| `version_gte="X.Y.Z"` | `>=X.Y.Z` | Version X.Y.Z or newer |
+| `version_gt="X.Y.Z"` | `>X.Y.Z` | Newer than version X.Y.Z |
+| `version_lte="X.Y.Z"` | `<=X.Y.Z` | Version X.Y.Z or older |
+| `version_lt="X.Y.Z"` | `<X.Y.Z` | Older than version X.Y.Z |
+
+Multiple constraints can be combined on the same dependency and will be joined with commas in the output.
+
+Given a `package.xml` with version constraints:
+
+```xml
+<depend version_gte="3.12.4">cmake</depend>
+<build_depend version_gte="3.3.0" version_lt="4.0.0">eigen</build_depend>
+<exec_depend version_eq="1.2.3">boost</exec_depend>
+```
+
+`pixi-ros init` generates:
+
+```toml
+[dependencies]
+cmake = ">=3.12.4"
+eigen = ">=3.3.0,<4.0.0"
+boost = "==1.2.3"
+```
+
 ## Supported ROS Distributions
 
 - ROS 2 Humble: https://prefix.dev/robostack-humble
@@ -113,24 +151,102 @@ Initialize or update a ROS workspace's `pixi.toml`.
 
 ```bash
 pixi-ros init --distro <ros_distro>
+pixi-ros init --distro humble --platform linux-64 --platform osx-arm64
 pixi-ros init
 ```
 
 **Options:**
-- `--distro`, `-d`: ROS distribution (optional)
+- `--distro`, `-d`: ROS distribution (optional, will prompt if not provided)
+- `--platform`, `-p`: Target platforms (optional, can be specified multiple times, will prompt if not provided)
+  - Available: `linux-64`, `osx-64`, `osx-arm64`, `win-64`
+  - Platforms come from the mapping files and determine which dependencies are available
 
 **What it does:**
 - Scans workspace for `package.xml` files
-- Reads all dependency types (build, exec, test)
-- Maps ROS dependencies to conda packages
+- Reads all dependency types (build, exec, test) and version constraints
+- Maps ROS dependencies to conda packages for each platform
+- Applies version constraints from package.xml to pixi.toml dependencies
 - Configures robostack channels
-- Checks package availability
+- Checks package availability per platform
 - Creates build tasks using colcon
 - Generates helpful `README_PIXI.md`
+- Sets up platform-specific dependencies in `pixi.toml`
 
 **Running multiple times:**
 The command is idempotent - you can run it multiple times to update dependencies as your workspace changes.
 
+## Multi-Platform Support
+
+`pixi-ros` supports generating cross-platform configurations. When you specify multiple platforms, it:
+
+1. **Analyzes dependencies per platform**: Some packages have platform-specific mappings (e.g., OpenGL requirements differ between Linux and macOS)
+
+2. **Organizes dependencies intelligently**:
+   - **Common dependencies** (available on all platforms) → `[dependencies]`
+   - **Unix dependencies** (available on Linux and macOS, but not Windows) → `[target.unix.dependencies]`
+   - **Platform-specific dependencies** → `[target.linux.dependencies]`, `[target.osx.dependencies]`, etc.
+
+3. **Sets up correct platform list**: The `[workspace]` section gets the appropriate pixi platform names
+
+### Platform Naming
+
+pixi-ros uses standard pixi platform names:
+- `linux-64` - Linux x86_64
+- `osx-64` - macOS Intel
+- `osx-arm64` - macOS Apple Silicon (M1/M2/M3)
+- `win-64` - Windows x86_64
+
+Internally, mapping files use a simplified format (`linux`, `osx`, `win64`), but this is transparent to users. When you specify `osx-64` and `osx-arm64`, they both use the same `osx` mapping rules since package availability is typically the same for both architectures.
+
+### Example: Multi-Platform Setup
+
+```bash
+pixi-ros init --distro humble --platform linux-64 --platform osx-arm64
+```
+
+Generates:
+
+```toml
+[workspace]
+name = "my_workspace"
+channels = [
+    "https://prefix.dev/robostack-humble",
+    "https://prefix.dev/conda-forge",
+]
+platforms = ["linux-64", "osx-arm64"]
+
+[dependencies]
+# Common dependencies (available on all platforms)
+ros-humble-rclcpp = "*"
+ros-humble-std-msgs = "*"
+
+[target.unix.dependencies]
+# Unix-specific dependencies (Linux and macOS)
+xorg-libx11 = "*"
+xorg-libxext = "*"
+
+[target.linux.dependencies]
+# Linux-specific dependencies
+libgl-devel = "*"
+libopengl-devel = "*"
+```
+
+### Interactive Platform Selection
+
+If you don't specify platforms, you'll be prompted:
+
+```bash
+$ pixi-ros init --distro humble
+
+Available target platforms:
+  1. linux-64
+  2. osx-64
+  3. osx-arm64
+  4. win-64
+
+Select platforms (enter numbers or names, comma or space separated): 1 3
+```
+
 ## Philosophy
 
 `pixi-ros` aims to be a quick **gateway drug**. It:

{pixi_ros-0.1.2 → pixi_ros-0.3.0}/pixi.lock

@@ -1073,7 +1073,7 @@ packages:
   timestamp: 1769677743677
 - conda: .
   name: pixi-ros
-  version: 0.1.2
+  version: 0.3.0
   build: pyh4616a5c_0
   subdir: noarch
   variants:

{pixi_ros-0.1.2 → pixi_ros-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pixi-ros"
-version = "0.1.2"
+version = "0.3.0"
 description = "Pixi extension for ROS package management"
 authors = [
     { name = "Ruben Arts", email = "ruben@prefix.dev" }

pixi_ros-0.3.0/src/pixi_ros/cli.py

@@ -0,0 +1,134 @@
+"""Main CLI entry point for pixi-ros."""
+
+from typing import Annotated
+
+import typer
+
+from pixi_ros.init import init_workspace
+from pixi_ros.mappings import get_platforms, get_ros_distros
+
+app = typer.Typer(
+    name="pixi-ros",
+    help="Pixi extension for ROS package management",
+    no_args_is_help=True,
+)
+
+pkg_app = typer.Typer(help="Manage ROS packages")
+app.add_typer(pkg_app, name="pkg")
+
+
+@app.command()
+def init(
+    distro: Annotated[
+        str | None,
+        typer.Option(
+            "--distro",
+            "-d",
+            help="ROS distribution (e.g., humble, iron, jazzy)",
+        ),
+    ] = None,
+    platforms: Annotated[
+        list[str] | None,
+        typer.Option(
+            "--platform",
+            "-p",
+            help="Target platforms (e.g., linux-64, osx-arm64, win-64)."
+            " Can be specified multiple times.",
+        ),
+    ] = None,
+):
+    """Initialize pixi.toml for a ROS workspace."""
+    # If distro not provided, prompt user to select one
+    if distro is None:
+        available_distros = get_ros_distros()
+        typer.echo("Available ROS distributions:")
+        for i, d in enumerate(available_distros, 1):
+            typer.echo(f"  {i}. {d}")
+
+        # Prompt for selection
+        selection = typer.prompt(
+            "\nSelect a distribution (enter number or name)",
+            type=str,
+        )
+
+        # Parse selection (either number or name)
+        try:
+            selection_num = int(selection)
+            dist_count = len(available_distros)
+            if 1 <= selection_num <= dist_count:
+                distro = available_distros[selection_num - 1]
+            else:
+                typer.echo(
+                    f"Error: Invalid selection. Please choose 1-{dist_count}",
+                    err=True,
+                )
+                raise typer.Exit(code=1)
+        except ValueError as err:
+            # User entered a name instead of number
+            if selection in available_distros:
+                distro = selection
+            else:
+                typer.echo(
+                    f"Error: '{selection}' is not a valid ROS distribution", err=True
+                )
+                typer.echo(f"Available: {', '.join(available_distros)}", err=True)
+                raise typer.Exit(code=1) from err
+
+    # If platforms not provided, prompt user to select
+    if platforms is None or len(platforms) == 0:
+        available_platforms = get_platforms()
+        typer.echo("\nAvailable target platforms:")
+        for i, p in enumerate(available_platforms, 1):
+            typer.echo(f"  {i}. {p}")
+
+        # Prompt for selection (can be comma-separated or space-separated)
+        selection = typer.prompt(
+            "\nSelect platforms (enter numbers or names, comma or space separated)",
+            type=str,
+        )
+
+        # Parse selection (can be numbers or names, comma or space separated)
+        platforms = []
+        # Split by comma or space
+        selections = selection.replace(",", " ").split()
+
+        for sel in selections:
+            sel = sel.strip()
+            if not sel:
+                continue
+
+            try:
+                # Try parsing as number
+                sel_num = int(sel)
+                if 1 <= sel_num <= len(available_platforms):
+                    platforms.append(available_platforms[sel_num - 1])
+                else:
+                    typer.echo(
+                        f"Error: Invalid selection {sel_num}."
+                        + f"Please choose 1-{len(available_platforms)}",
+                        err=True,
+                    )
+                    raise typer.Exit(code=1)
+            except ValueError as err:
+                # User entered a name instead of number
+                if sel in available_platforms:
+                    platforms.append(sel)
+                else:
+                    typer.echo(f"Error: '{sel}' is not a valid platform", err=True)
+                    typer.echo(f"Available: {', '.join(available_platforms)}", err=True)
+                    raise typer.Exit(code=1) from err
+
+        if not platforms:
+            typer.echo("Error: No platforms selected", err=True)
+            raise typer.Exit(code=1)
+
+    init_workspace(distro, platforms=platforms)
+
+
+def main():
+    """Entry point for the CLI."""
+    app()
+
+
+if __name__ == "__main__":
+    main()

{pixi_ros-0.1.2 → pixi_ros-0.3.0}/src/pixi_ros/data/conda-forge.yaml

@@ -792,6 +792,8 @@ python3-importlib-resources:
   pixi: [importlib_resources]
 python3-jinja2:
   pixi: [jinja2]
+python3-jsonschema:
+  pixi: [jsonschema]
 python3-kitchen:
   pixi: [kitchen]
 python3-lark-parser: