[21009] Do not require PYTHON_VERSION to be defined in .bat files #4770

Mario-DL · 2024-05-13T10:38:00Z

Description

@MiguelCompany identified an error introduced in #4759 as the PYTHON_VERSION does not necessarily need to be defined when executing the fastdds.bat or ros-discovery.bat scripts.
The change simply requires a specific version of Python only if PYTHON_VERSION is defined.

Tested on Windows.

@Mergifyio backport 2.14.x 2.13.x

Cherry-pick on #4765 and #4766

Contributor Checklist

Commit messages follow the project guidelines.
The code follows the style guidelines of this project.
N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
N/A Any new/modified methods have been properly documented using Doxygen.
N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
Changes are ABI compatible.
Changes are API compatible.
N/A New feature has been added to the versions.md file (if applicable).
N/A New feature has been documented/Current behavior is correctly described in the documentation.
Applicable backports have been included in the description.

Reviewer Checklist

The PR has a milestone assigned.
The title and description correctly express the PR's purpose.
Check contributor checklist is correct.
N/A Check CI results: changes do not issue any warning.
N/A Check CI results: failing tests are unrelated with the changes.

… defined Signed-off-by: Mario Dominguez <[email protected]>

Mario-DL · 2024-05-13T10:39:39Z

@richiprosima please test windows

tools/fastdds/fastdds.bat

MiguelCompany · 2024-05-17T05:37:41Z

@Mergifyio backport 2.14.x 2.13.x

mergify · 2024-05-17T05:37:49Z

backport 2.14.x 2.13.x

✅ Backports have been created

#4797 [21009] Do not require PYTHON_VERSION to be defined in .bat files (backport #4770) has been created for branch 2.14.x
#4798 [21009] Do not require PYTHON_VERSION to be defined in .bat files (backport #4770) has been created for branch 2.13.x

Signed-off-by: Mario Dominguez <[email protected]> (cherry picked from commit 39e8957)

Signed-off-by: Mario Dominguez <[email protected]>

…tests environment issues. (#4759, #4447, #4770) (#4765) * Fix Python Installation version in Github CI. Address failing system tests environment issues (#4759) * Refs #20965: Install a fix python version in ubuntu and windows cis Signed-off-by: Mario Dominguez <[email protected]> * Refs #20965: Decide Python environment depending on the version Signed-off-by: Mario Dominguez <[email protected]> * Refs #20965: Prevent Qt installation from setting up python in Ubuntu CI Signed-off-by: Mario Dominguez <[email protected]> * Refs #20965: Add some comments Signed-off-by: Mario Dominguez <[email protected]> --------- Signed-off-by: Mario Dominguez <[email protected]> (cherry picked from commit 3b2e781) # Conflicts: # test/system/tools/fastdds/CMakeLists.txt * Solve conflicts Signed-off-by: Mario Dominguez <[email protected]> * Remove use of deprecated FindPythonInterp (#4447) Signed-off-by: EduPonz <[email protected]> * Add missing Python3_executable communication test command Signed-off-by: Mario Dominguez <[email protected]> * Do not require PYTHON_VERSION to be defined in .bat files (#4770) Signed-off-by: Mario Dominguez <[email protected]> --------- Signed-off-by: Mario Dominguez <[email protected]> Signed-off-by: EduPonz <[email protected]> Co-authored-by: Mario Domínguez López <[email protected]> Co-authored-by: Mario Dominguez <[email protected]> Co-authored-by: Eduardo Ponz Segrelles <[email protected]>

) Signed-off-by: Mario Dominguez <[email protected]> (cherry picked from commit 39e8957) Co-authored-by: Mario Domínguez López <[email protected]>

…tests environment issues (#4759) (#4766) * Fix Python Installation version in Github CI. Address failing system tests environment issues (#4759) * Refs #20965: Install a fix python version in ubuntu and windows cis Signed-off-by: Mario Dominguez <[email protected]> * Refs #20965: Decide Python environment depending on the version Signed-off-by: Mario Dominguez <[email protected]> * Refs #20965: Prevent Qt installation from setting up python in Ubuntu CI Signed-off-by: Mario Dominguez <[email protected]> * Refs #20965: Add some comments Signed-off-by: Mario Dominguez <[email protected]> --------- Signed-off-by: Mario Dominguez <[email protected]> (cherry picked from commit 3b2e781) # Conflicts: # test/system/tools/fastdds/CMakeLists.txt * Solve conflicts Signed-off-by: Mario Dominguez <[email protected]> * Remove use of deprecated FindPythonInterp (#4447) Signed-off-by: EduPonz <[email protected]> * Add missing Python3_executable communication test command Signed-off-by: Mario Dominguez <[email protected]> * Do not require PYTHON_VERSION to be defined in .bat files (#4770) Signed-off-by: Mario Dominguez <[email protected]> --------- Signed-off-by: Mario Dominguez <[email protected]> Signed-off-by: EduPonz <[email protected]> Co-authored-by: Mario Domínguez López <[email protected]> Co-authored-by: Mario Dominguez <[email protected]> Co-authored-by: Eduardo Ponz Segrelles <[email protected]>

) Signed-off-by: Mario Dominguez <[email protected]> (cherry picked from commit 39e8957) Co-authored-by: Mario Domínguez López <[email protected]>

Refs #21009: Do not require PYTHON_VERSION environment variable to be…

311ecd3

… defined Signed-off-by: Mario Dominguez <[email protected]>

Mario-DL added this to the v3.0.0 milestone May 13, 2024

Mario-DL requested a review from MiguelCompany May 13, 2024 10:38

github-actions bot added the ci-pending PR which CI is running label May 13, 2024

Mario-DL requested review from MiguelCompany and removed request for MiguelCompany May 13, 2024 14:53

MiguelCompany approved these changes May 14, 2024

View reviewed changes

tools/fastdds/fastdds.bat Show resolved Hide resolved

Mario-DL added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels May 16, 2024

MiguelCompany merged commit 39e8957 into master May 17, 2024
5 of 23 checks passed

MiguelCompany deleted the fix/21009 branch May 17, 2024 05:36

mergify bot pushed a commit that referenced this pull request May 17, 2024

Do not require PYTHON_VERSION to be defined in .bat files (#4770)

dae596a

Signed-off-by: Mario Dominguez <[email protected]> (cherry picked from commit 39e8957)

mergify bot pushed a commit that referenced this pull request May 17, 2024

Do not require PYTHON_VERSION to be defined in .bat files (#4770)

704946b

Signed-off-by: Mario Dominguez <[email protected]> (cherry picked from commit 39e8957)

This was referenced May 17, 2024

[21009] Do not require PYTHON_VERSION to be defined in .bat files (backport #4770) #4797

Merged

[21009] Do not require PYTHON_VERSION to be defined in .bat files (backport #4770) #4798

Merged

Mario-DL added a commit that referenced this pull request May 17, 2024

Do not require PYTHON_VERSION to be defined in .bat files (#4770)

0536165

Signed-off-by: Mario Dominguez <[email protected]>

Mario-DL added a commit that referenced this pull request May 17, 2024

Do not require PYTHON_VERSION to be defined in .bat files (#4770)

15067c8

Signed-off-by: Mario Dominguez <[email protected]>

MiguelCompany pushed a commit that referenced this pull request May 17, 2024

Do not require PYTHON_VERSION to be defined in .bat files (#4770)

d7fc144

Signed-off-by: Mario Dominguez <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[21009] Do not require PYTHON_VERSION to be defined in .bat files #4770

[21009] Do not require PYTHON_VERSION to be defined in .bat files #4770

Mario-DL commented May 13, 2024 •

edited by MiguelCompany

Loading

Mario-DL commented May 13, 2024

MiguelCompany commented May 17, 2024

mergify bot commented May 17, 2024 •

edited

Loading

[21009] Do not require PYTHON_VERSION to be defined in .bat files #4770

[21009] Do not require PYTHON_VERSION to be defined in .bat files #4770

Conversation

Mario-DL commented May 13, 2024 • edited by MiguelCompany Loading

Description

Contributor Checklist

Reviewer Checklist

Mario-DL commented May 13, 2024

MiguelCompany commented May 17, 2024

mergify bot commented May 17, 2024 • edited Loading

✅ Backports have been created

Mario-DL commented May 13, 2024 •

edited by MiguelCompany

Loading

mergify bot commented May 17, 2024 •

edited

Loading