Skip to content

Commit

Permalink
Remove all code related to FAST CDR v1 (#169)
Browse files Browse the repository at this point in the history
* Refs #21325: Regenerate types

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21325: Do not include fastcdr code in RTD builds

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21325: Apply suggestions

Signed-off-by: eduponz <eduardoponz@eprosima.com>

---------

Signed-off-by: eduponz <eduardoponz@eprosima.com>
  • Loading branch information
EduPonz authored Jul 24, 2024
1 parent 284d2b0 commit b6f66ca
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 367 deletions.
2 changes: 1 addition & 1 deletion fastdds_python/src/swig/fastdds.i
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ namespace xtypes {
// Failing to do so will issue a warning, but will not stop the compilation.
// However, the resulting derived class will **not** be considered as inheriting from the base class

#ifndef FASTDDS_DOCS_BUILD
%include <fastcdr/config.h>
#if FASTCDR_VERSION_MAJOR > 1
%include "fastcdr/xcdr/optional.i"
#endif

Expand Down
7 changes: 0 additions & 7 deletions fastdds_python/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,11 @@
# Compile types
add_subdirectory(types)

set(fastcdr_version_argument "v2")
if (${fastcdr_VERSION_MAJOR} EQUAL 1)
set(fastcdr_version_argument "v1")
endif()


add_test(NAME api_tests
COMMAND
${Python3_EXECUTABLE}
-m pytest
-vrP
--cdr ${fastcdr_version_argument}
WORKING_DIRECTORY
${CMAKE_CURRENT_SOURCE_DIR}/api
)
3 changes: 0 additions & 3 deletions fastdds_python/test/api/conftest.py

This file was deleted.

176 changes: 68 additions & 108 deletions fastdds_python/test/api/test_datareader.py

Large diffs are not rendered by default.

Loading

0 comments on commit b6f66ca

Please sign in to comment.