Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[21325] Remove all code related to FAST CDR v1 #169

Merged
merged 3 commits into from
Jul 24, 2024
Merged

[21325] Remove all code related to FAST CDR v1 #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac42341
Refs #21325: Regenerate types
EduPonz Jul 18, 2024
74d3756
Refs #21325: Do not include fastcdr code in RTD builds
EduPonz Jul 20, 2024
e90434a
Refs #21325: Apply suggestions
EduPonz Jul 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fastdds_python/src/swig/fastdds.i
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

176 changes: 68 additions & 108 deletions fastdds_python/test/api/test_datareader.py
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading