From 2969808a30d5ec145cda3f63c629fe057268fb12 Mon Sep 17 00:00:00 2001
From: Carlos Espinoza Curto <148376273+Carlosespicur@users.noreply.github.com>
Date: Mon, 22 Sep 2025 12:35:33 +0200
Subject: [PATCH 1/2] Add requirements.txt file for Python dependencies (#40)

Signed-off-by: Carlosespicur <carlosespicur@proton.me>
(cherry picked from commit 0ca68865675f751bf5012715da0e4ac5c7eb08a8)

# Conflicts:
#	.github/workflows/reusable-ci.yml
#	README.md
---
 .../actions/install_python_packages/action.yml   | 16 ++++++++++++++--
 .github/workflows/reusable-ci.yml                |  4 ++++
 README.md                                        |  4 ++++
 requirements.txt                                 |  4 ++++
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 requirements.txt

diff --git a/.github/actions/install_python_packages/action.yml b/.github/actions/install_python_packages/action.yml
index 79ed278..919b3a5 100644
--- a/.github/actions/install_python_packages/action.yml
+++ b/.github/actions/install_python_packages/action.yml
@@ -4,7 +4,12 @@ description: 'Install specified Python packages in a virtual environment'
 inputs:
   packages:
     description: 'A space-separated list of Python packages to install.'
-    required: true
+    required: false
+    default: ''
+  requirements-file:
+    description: 'Path to a requirements.txt file listing Python packages to install.'
+    required: false
+    default: ''
   python-version:
     description: 'The Python version to use (e.g., 3.12).'
     required: true
@@ -36,5 +41,12 @@ runs:
 
     - name: Install Python packages
       run: |
-        pip install ${{ inputs.packages }}
+        if [ -n "${{ inputs.requirements-file }}" ]; then
+          pip install -r ${{ inputs.requirements-file }}
+        fi
+
+        if [ -n "${{ inputs.packages }}" ]; then
+          pip install ${{ inputs.packages }}
+        fi
+
       shell: bash
diff --git a/.github/workflows/reusable-ci.yml b/.github/workflows/reusable-ci.yml
index 7e99e97..0b75585 100644
--- a/.github/workflows/reusable-ci.yml
+++ b/.github/workflows/reusable-ci.yml
@@ -45,7 +45,11 @@ jobs:
       - name: Install required python packages
         uses: ./.github/actions/install_python_packages
         with:
+<<<<<<< HEAD
           packages: "catkin_pkg lark-parser empy colcon-common-extensions"
+=======
+          requirements-file: "${{ github.workspace }}/requirements.txt"
+>>>>>>> 0ca6886 (Add requirements.txt file for Python dependencies (#40))
           python-version: ${{ inputs.python-version }}
           use-sudo: "true"
 
diff --git a/README.md b/README.md
index 8def105..ac0db58 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,11 @@ sudo apt install -y rsync pip git gcc-arm-none-eabi cmake
 This component needs `colcon` and other Python 3 packages in order to build micro-ROS packages:
 
 ```bash
+<<<<<<< HEAD
 pip3 install catkin_pkg lark-parser empy colcon-common-extensions
+=======
+pip3 install -r requirements.txt
+>>>>>>> 0ca6886 (Add requirements.txt file for Python dependencies (#40))
 ```
 
 ## Usage
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..4f3612c
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,4 @@
+catkin_pkg
+lark-parser
+empy==3.3.4
+colcon-common-extensions

From 3675282aba6331b84fc9fff0357742c239197eaf Mon Sep 17 00:00:00 2001
From: Carlos Espinoza Curto <148376273+Carlosespicur@users.noreply.github.com>
Date: Mon, 22 Sep 2025 12:41:50 +0200
Subject: [PATCH 2/2] Resolve conflicts and remove empy version

---
 .github/workflows/reusable-ci.yml | 4 ----
 README.md                         | 4 ----
 requirements.txt                  | 2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/reusable-ci.yml b/.github/workflows/reusable-ci.yml
index 0b75585..1aac06a 100644
--- a/.github/workflows/reusable-ci.yml
+++ b/.github/workflows/reusable-ci.yml
@@ -45,11 +45,7 @@ jobs:
       - name: Install required python packages
         uses: ./.github/actions/install_python_packages
         with:
-<<<<<<< HEAD
-          packages: "catkin_pkg lark-parser empy colcon-common-extensions"
-=======
           requirements-file: "${{ github.workspace }}/requirements.txt"
->>>>>>> 0ca6886 (Add requirements.txt file for Python dependencies (#40))
           python-version: ${{ inputs.python-version }}
           use-sudo: "true"
 
diff --git a/README.md b/README.md
index ac0db58..ffab697 100644
--- a/README.md
+++ b/README.md
@@ -18,11 +18,7 @@ sudo apt install -y rsync pip git gcc-arm-none-eabi cmake
 This component needs `colcon` and other Python 3 packages in order to build micro-ROS packages:
 
 ```bash
-<<<<<<< HEAD
-pip3 install catkin_pkg lark-parser empy colcon-common-extensions
-=======
 pip3 install -r requirements.txt
->>>>>>> 0ca6886 (Add requirements.txt file for Python dependencies (#40))
 ```
 
 ## Usage
diff --git a/requirements.txt b/requirements.txt
index 4f3612c..e49532c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 catkin_pkg
 lark-parser
-empy==3.3.4
+empy
 colcon-common-extensions