[19452] Switch main to 2.0.x

.github/pull_request_template.md

@@ -27,6 +27,11 @@
 
 ## Contributor Checklist
 
+<!--
+    - If any of the elements of the following checklist is not applicable, substitute the checkbox [ ] by _N/A_:
+    - If any of the elements of the following checklist is not fulfilled on purpose, please provide a reason and substitute the checkbox [ ] with ❌: or __NO__:.
+-->
+
 - [ ] Commit messages follow the project guidelines. <!-- External contributors should sign the DCO. Fast DDS Python developers must also refer to the internal Redmine task. -->
 - [ ] 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
 - [ ] Changes are API compatible. <!-- Public API must not be broken within the same major release. -->

.github/workflows/build_and_test.yml

@@ -10,7 +10,7 @@ on:
       fastcdr_versions:
         description: 'Fast CDR branches to be used'
         required: false
-        default: '["1.1.x", "master"]'
+        default: '["master"]'
       fastdds_branch:
         description: 'Fast DDS branch to be used'
         required: false
@@ -34,7 +34,7 @@ jobs:
       matrix:
         foonathan_memory_vendor_version:
           - ${{ github.event.inputs.foonathan_memory_vendor_branch || 'master' }}
-        fastcdr_version: ${{ fromJson(github.event.inputs.fastcdr_versions || '["1.1.x", "master"]') }}
+        fastcdr_version: ${{ fromJson(github.event.inputs.fastcdr_versions || '["master"]') }}
         fastdds_version:
           - ${{ github.event.inputs.fastdds_branch || 'master' }}
 
@@ -153,7 +153,7 @@ jobs:
       matrix:
         foonathan_memory_vendor_version:
           - ${{ github.event.inputs.foonathan_memory_vendor_branch || 'master' }}
-        fastcdr_version: ${{ fromJson(github.event.inputs.fastcdr_versions || '["1.1.x", "master"]') }}
+        fastcdr_version: ${{ fromJson(github.event.inputs.fastcdr_versions || '["master"]') }}
         fastdds_version:
           - ${{ github.event.inputs.fastdds_branch || 'master' }}
 

.github/workflows/mirror.yml

@@ -3,15 +3,18 @@ on:
   push:
     branches:
       - 'main'
+      - '1.4.x'
 jobs:
-  mirror_job:
+  mirror_job_main:
+    if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     name: Mirror main branch to compatible minor version branches
     strategy:
       fail-fast: false
       matrix:
         dest_branch:
-          - '1.4.x'
+          - '2.0.x'
+          - '2.x'
     steps:
     - name: Mirror action step
       id: mirror
@@ -20,3 +23,21 @@ jobs:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         source: 'main'
         dest: ${{ matrix.dest_branch }}
+
+  mirror_job_1_x:
+    if: github.ref == 'refs/heads/1.4.x'
+    runs-on: ubuntu-latest
+    name: Mirror 1.4.x branch to compatible version branches
+    strategy:
+      fail-fast: false
+      matrix:
+        dest_branch:
+          - '1.x'
+    steps:
+    - name: Mirror action step
+      id: mirror
+      uses: eProsima/eProsima-CI/external/mirror-branch-action@v0
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        source: '1.4.x'
+        dest: ${{ matrix.dest_branch }}

.github/workflows/test.meta

@@ -1,7 +1,7 @@
 {
     "names":
     {
-        "fastrtps":
+        "fastdds":
         {
             "cmake-args": [
                 "-DSECURITY=ON"

README.md

@@ -8,6 +8,10 @@
 [![Forks](https://img.shields.io/github/forks/eProsima/Fast-DDS-python.svg)](https://github.com/eProsima/Fast-DDS-python/network/members)
 [![Stars](https://img.shields.io/github/stars/eProsima/Fast-DDS-python.svg)](https://github.com/eProsima/Fast-DDS-python/stargazers)
 
+<!-- TODO(eduponz): Remove this before releasing v3.0.0 -->
+> [!WARNING]
+> In preparation for v2.0.0 (bindings for Fast DDS v3.0.0), Fast DDS Python's master branch is undergoing major changes entailing **API breaks**.
+> Until Fast DDS Python v2.0.0 is released, it is strongly advisable to use the latest stable version, [v1.4.1](https://github.com/eProsima/Fast-DDS-python/tree/v1.4.1).
 
 *eProsima Fast DDS Python* is a Python binding for the [*eProsima Fast DDS*](https://github.com/eProsima/Fast-DDS) C++ library.
 This is a work in progress, but ultimately the goal is having the complete *Fast DDS* API available in Python.

fastdds_python.repos

@@ -10,12 +10,12 @@ repositories:
     fastdds:
         type: git
         url: https://github.com/eProsima/Fast-DDS.git
-        version: master
+        version: 3.0.x-devel
     fastdds_python:
         type: git
         url: https://github.com/eProsima/Fast-DDS-python.git
         version: main
     fastddsgen:
         type: git
         url: https://github.com/eProsima/Fast-DDS-Gen.git
-        version: master
+        version: 4.0.x-devel

fastdds_python/CMakeLists.txt

@@ -24,7 +24,7 @@ if(POLICY CMP0086)
   cmake_policy(SET CMP0086 NEW)
 endif()
 
-project(fastdds_python VERSION 1.4.1)
+project(fastdds_python VERSION 2.0.0)
 
 # Set BUILD_TESTING to OFF by default.
 if(NOT BUILD_TESTING)
@@ -43,7 +43,7 @@ set(CMAKE_SWIG_FLAGS "")
 find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
 
 find_package(fastcdr REQUIRED)
-find_package(fastrtps 2.12 REQUIRED)
+find_package(fastdds 3 REQUIRED)
 
 ###############################################################################
 # Project subdirectories

fastdds_python/colcon.pkg

@@ -1,5 +1,5 @@
 {
     "name": "fastdds_python",
     "type": "cmake",
-    "build-dependencies": ["fastrtps"]
+    "build-dependencies": ["fastdds"]
 }

fastdds_python/src/swig/CMakeLists.txt

@@ -56,7 +56,7 @@ endif()
 target_link_libraries(${PROJECT_NAME}
     Python3::Module
     fastcdr
-    fastrtps
+    fastdds
     )
 
 # Find the installation path

fastdds_python/src/swig/fastdds.i

@@ -57,7 +57,7 @@
 %include "typemaps.i"
 
 %{
-#include "fastrtps/config.h"
+#include "fastdds/config.h"
 
 bool has_statistics()
 {
@@ -89,8 +89,8 @@ bool has_statistics();
 
 // Macro delcarations
 // Any macro used on the Fast DDS header files will give an error if it is not redefined here
-#define RTPS_DllAPI
-#define FASTRTPS_DEPRECATED(msg)
+#define eProsima_user_DllExport
+#define FASTDDS_EXPORTED_API
 #define FASTDDS_DEPRECATED_UNTIL(major, entity_name, msg)
 #define FASTDDS_TODO_BEFORE(major, minor, msg)
 
@@ -109,6 +109,12 @@ namespace builtin {
     // Just declaring the namespace
 
 } // namespace builtin
+
+namespace xtypes {
+
+    // Just declaring the namespace
+
+} // namespace xtypes
 } // namespace dds
 } // namespace fastdds
 } // namespace eprosima
@@ -124,6 +130,7 @@ namespace builtin {
 %include "fastcdr/xcdr/optional.i"
 #endif
 
+%include "fastdds/LibrarySettings.i"
 %include "fastdds/rtps/common/VendorId_t.i"
 %include "fastdds/rtps/common/Types.i"
 %include "fastdds/rtps/common/Time_t.i"
@@ -136,10 +143,9 @@ namespace builtin {
 %include "fastdds/rtps/common/Guid.i"
 %include "fastdds/rtps/common/PortParameters.i"
 %include "fastdds/rtps/common/InstanceHandle.i"
-%include "fastrtps/types/TypesBase.i"
 %include "fastdds/rtps/resources/ResourceManagement.i"
-%include "fastrtps/utils/collections/ResourceLimitedContainerConfig.i"
-%include "fastrtps/utils/collections/ResourceLimitedVector.i"
+%include "fastdds/utils/collections/ResourceLimitedContainerConfig.i"
+%include "fastdds/utils/collections/ResourceLimitedVector.i"
 %include "fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.i"
 %include "fastdds/rtps/attributes/ThreadSettings.i"
 %include "fastdds/rtps/flowcontrol/FlowControllerSchedulerPolicy.i"
@@ -307,28 +313,6 @@ namespace builtin {
 %include "fastrtps/qos/LivelinessLostStatus.i"
 %include "fastrtps/qos/LivelinessChangedStatus.i"
 %include "fastrtps/qos/SampleRejectedStatus.i"
-%include "fastrtps/types/DynamicDataFactory.i"
-%include "fastrtps/types/DynamicType.i"
-%include "fastrtps/types/TypeNamesGenerator.i"
-%include "fastrtps/types/AnnotationDescriptor.i"
-%include "fastrtps/types/TypeDescriptor.i"
-%include "fastrtps/types/DynamicDataPtr.i"
-%include "fastrtps/types/DynamicTypeBuilder.i"
-%include "fastrtps/types/DynamicTypeBuilderFactory.i"
-%include "fastrtps/types/TypeObjectHashId.i"
-%include "fastrtps/types/TypeObject.i"
-%include "fastrtps/types/BuiltinAnnotationsTypeObject.i"
-%include "fastrtps/types/DynamicDataHelper.i"
-%include "fastrtps/types/DynamicTypeBuilderPtr.i"
-%include "fastrtps/types/TypeIdentifier.i"
-%include "fastrtps/types/DynamicData.i"
-%include "fastrtps/types/MemberDescriptor.i"
-%include "fastrtps/types/TypeIdentifierTypes.i"
-%include "fastrtps/types/DynamicTypeMember.i"
-%include "fastrtps/types/AnnotationParameterValue.i"
-%include "fastrtps/types/TypeObjectFactory.i"
-%include "fastrtps/types/DynamicTypePtr.i"
-%include "fastrtps/types/DynamicPubSubType.i"
 %include "fastrtps/config/doxygen_modules.i"
 %include "fastrtps/log/Log.i"
 %include "fastrtps/log/StdoutConsumer.i"
@@ -429,6 +413,7 @@ namespace builtin {
 */
 
 %include "fastdds/dds/common/InstanceHandle.i"
+%include "fastdds/dds/core/ReturnCode.i"
 %include "fastdds/dds/core/status/StatusMask.i"
 %include "fastdds/dds/core/policy/ParameterTypes.i"
 %include "fastdds/dds/core/policy/QosPolicies.i"
@@ -449,6 +434,7 @@ namespace builtin {
 %include "fastdds/dds/core/UserAllocatedSequence.i"
 %include "fastdds/dds/core/LoanableSequence.i"
 %include "fastdds/dds/core/LoanableArray.i"
+%include "fastdds/dds/core/Types.i"
 %include "fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.i"
 %include "fastdds/dds/core/policy/WriterDataLifecycleQosPolicy.i"
 %include "fastdds/dds/core/status/LivelinessChangedStatus.i"
@@ -485,8 +471,11 @@ namespace builtin {
 %include "fastdds/dds/domain/DomainParticipantListener.i"
 %include "fastdds/dds/domain/qos/DomainParticipantFactoryQos.i"
 %include "fastdds/dds/domain/qos/DomainParticipantQos.i"
+%include "fastdds/dds/domain/qos/ReplierQos.i"
+%include "fastdds/dds/domain/qos/RequesterQos.i"
 %include "fastdds/dds/domain/DomainParticipant.i"
 %include "fastdds/dds/domain/DomainParticipantFactory.i"
+%include "fastdds/dds/xtypes/type_representation/TypeObject.i"
 
 // Log functionality not available in the bind
 // Logs in the library is still available, only 'Log' class will not be available on Python

fastdds_python/src/swig/fastrtps/types/TypeObject.i → fastdds_python/src/swig/fastdds/LibrarySettings.i

@@ -1,4 +1,4 @@
-// Copyright 2022 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+// Copyright 2024 Proyectos y Sistemas de Mantenimiento SL (eProsima).
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 %{
-#include "fastrtps/types/TypeObject.h"
+#include "fastdds/LibrarySettings.hpp"
 %}
 
-%include "fastrtps/types/TypeObject.h"
+%include "fastdds/LibrarySettings.hpp"

fastdds_python/src/swig/fastdds/dds/common/InstanceHandle.i

@@ -16,5 +16,4 @@
 #include "fastdds/dds/common/InstanceHandle.hpp"
 %}
 
-
 %include "fastdds/dds/common/InstanceHandle.hpp"

fastdds_python/src/swig/fastdds/dds/builtin/typelookup/TypeLookupManager.i → fastdds_python/src/swig/fastdds/dds/core/ReturnCode.i

@@ -1,4 +1,4 @@
-// Copyright 2022 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+// Copyright 2023 Proyectos y Sistemas de Mantenimiento SL (eProsima).
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,7 +13,10 @@
 // limitations under the License.
 
 %{
-#include "fastdds/dds/builtin/typelookup/TypeLookupManager.hpp"
+#include "fastdds/dds/core/ReturnCode.hpp"
 %}
 
-%include "fastdds/dds/builtin/typelookup/TypeLookupManager.hpp"
+
+%include "fastdds/dds/core/detail/DDSReturnCode.hpp"
+%include "fastdds/dds/core/detail/DDSSecurityReturnCode.hpp"
+%include "fastdds/dds/core/ReturnCode.hpp"