Skip to content

Commit

Permalink
Upgrade python requirements and remove all warnings (#747)
Browse files Browse the repository at this point in the history
* Refs #20631. Update requirements and fix warnings

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #20631. Add support for CMAKE_COMPILE_WARNING_AS_ERROR

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #20631. Fix getting fastdds branch in readthedocs

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #20631. Move note by suggestion

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #20631. Fix idl

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #20631. Remove forgotten lines

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #20631. Fixes

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #20631: Avoid duplicated transport_id in XMLTester

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

---------

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
Signed-off-by: eduponz <eduardoponz@eprosima.com>
Co-authored-by: eduponz <eduardoponz@eprosima.com>
  • Loading branch information
richiware and EduPonz committed May 9, 2024
1 parent f8a6dee commit d6eeda0
Show file tree
Hide file tree
Showing 75 changed files with 244 additions and 177 deletions.
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ string(REGEX REPLACE "^version = u'([0-9]+.[0-9]+.[0-9]+)'"

project(fastdds-docs VERSION "${LIB_VERSION_STR}" LANGUAGES C CXX)

# In case CMake version less than 3.24, add the option CMAKE_COMPILE_WARNING_AS_ERROR.
if (${CMAKE_VERSION} VERSION_LESS "3.24")
option(CMAKE_COMPILE_WARNING_AS_ERROR "Treat warnings as errors" OFF)
endif()


####################################################################################################
# Build Doxygen documentation
Expand Down Expand Up @@ -125,7 +130,9 @@ if (BUILD_DOCUMENTATION)
# Generate the sphinx documentation
add_custom_target(Sphinx ALL
COMMAND
${SPHINX_EXECUTABLE} -b ${FASTDDS_DOCS_BUILDER}
${SPHINX_EXECUTABLE}
$<$<BOOL:${CMAKE_COMPILE_WARNING_AS_ERROR}>:-W>
-b ${FASTDDS_DOCS_BUILDER}
# Tell Breathe where to find the Doxygen output
-D breathe_projects.FastDDS=${DOXYGEN_OUTPUT_DIR}/xml
${PYTHON_EXTRA_FLAG}
Expand Down
12 changes: 6 additions & 6 deletions code/DynamicTypesIDLExamples.idl
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ struct AliasStruct
//!--IDL_SEQUENCES
struct SequenceStruct
{
sequence<MyBitmask> bitmask_sequence;
sequence<MyBitMask> bitmask_sequence;
sequence<short, 5> short_sequence;
};
//!--
Expand All @@ -132,18 +132,18 @@ struct MapStruct

//!--IDL_STRUCT
struct InnerStruct
{
{
@id(0x10) long first;
};

struct ParentStruct
{
{
float first;
long long second;
};

struct ComplexStruct : ParentStruct
{
{
InnerStruct complex_member;
};
//!--
Expand All @@ -170,7 +170,7 @@ union ComplexUnion switch (long)

//!--IDL_BITSET
bitset ParentBitSet
{
{
bitfield<3> a;
bitfield<1> b;
bitfield<4>;
Expand All @@ -179,7 +179,7 @@ bitset ParentBitSet
};

bitset ChildBitSet : ParentBitSet
{
{
bitfield<1> e;
bitfield<20, unsigned long> f;
};
Expand Down
2 changes: 1 addition & 1 deletion code/XMLTester.xml
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@
<!-->CONF-COMMON-RECEPTION-THREADS-SETTINGS<-->
<transport_descriptors>
<transport_descriptor>
<transport_id>Test</transport_id>
<transport_id>test_transport</transport_id>
<type>UDPv4</type>
<reception_threads>
<reception_thread port="20000">
Expand Down
9 changes: 5 additions & 4 deletions colcon.meta
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
names:
fastdds:
cmake-args:
- "-DSECURITY=ON"
- -DSECURITY=ON
fastdds_python:
cmake-args:
- "-DBUILD_DOCUMENTATION=ON"
- -DBUILD_DOCUMENTATION=ON
fastdds-docs:
cmake-args:
- "-DBUILD_DOCUMENTATION=ON"
- "-DCOMPILE_TESTS=ON"
- -DBUILD_DOCUMENTATION=ON
- -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
- -DCOMPILE_TESTS=ON
10 changes: 9 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,15 @@ def get_git_branch():
# Invoke git to get the current branch which we use to get the theme
try:
p = subprocess.Popen(
['git', 'rev-parse', '--abbrev-ref', 'HEAD'],
['git', 'rev-parse', '--verify', 'HEAD'],
stdout=subprocess.PIPE,
cwd=path_to_here
)

commit = p.communicate()[0].decode().rstrip()

p = subprocess.Popen(
['git', 'name-rev', '--name-only', commit],
stdout=subprocess.PIPE,
cwd=path_to_here
)
Expand Down
11 changes: 6 additions & 5 deletions docs/fastdds/api_reference/api_reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ For more information about the API reference, please refer to
`Fast DDS API reference <https://www.eprosima.com/docs/fast-rtps/latest/API>`_.

.. toctree::
:titlesonly:

/fastdds/api_reference/dds_pim/dds_pim
/fastdds/api_reference/rtps/rtps
/fastdds/api_reference/transport/transport
/fastdds/api_reference/log/log
/fastdds/api_reference/statistics/statistics
/fastdds/api_reference/dds_pim/dds_pim
/fastdds/api_reference/rtps/rtps
/fastdds/api_reference/transport/transport
/fastdds/api_reference/log/log
/fastdds/api_reference/statistics/statistics
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Condition
=========

.. toctree::
:titlesonly:

/fastdds/api_reference/dds_pim/core/condition/condition.rst
/fastdds/api_reference/dds_pim/core/condition/conditionseq.rst
Expand Down
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/dds_pim/core/core.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Core
====

.. toctree::
:titlesonly:

/fastdds/api_reference/dds_pim/core/entity.rst
/fastdds/api_reference/dds_pim/core/domainentity.rst
Expand Down
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/dds_pim/core/policy/policy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Policy
======

.. toctree::
:titlesonly:

/fastdds/api_reference/dds_pim/core/policy/datarepresentationid.rst
/fastdds/api_reference/dds_pim/core/policy/datarepresentationqospolicy.rst
Expand Down
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/dds_pim/core/status/status.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Status
======

.. toctree::
:titlesonly:

/fastdds/api_reference/dds_pim/core/status/basestatus.rst
/fastdds/api_reference/dds_pim/core/status/deadlinemissedstatus.rst
Expand Down
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/dds_pim/dds_pim.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ DDS DCPS PIM
Data Distribution Service (DDS) Data-Centric Publish-Subscribe (DCPS) Platform Independent Model (PIM) API

.. toctree::
:titlesonly:

/fastdds/api_reference/dds_pim/core/core.rst
/fastdds/api_reference/dds_pim/domain/domain.rst
Expand Down
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/dds_pim/domain/domain.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Domain
======

.. toctree::
:titlesonly:

/fastdds/api_reference/dds_pim/domain/domainparticipant.rst
/fastdds/api_reference/dds_pim/domain/domainparticipantfactory.rst
Expand Down
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/dds_pim/publisher/publisher.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Publisher
=========

.. toctree::
:titlesonly:

/fastdds/api_reference/dds_pim/publisher/datawriter.rst
/fastdds/api_reference/dds_pim/publisher/datawriterlistener.rst
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Subscriber
==========

.. toctree::
:titlesonly:

/fastdds/api_reference/dds_pim/subscriber/datareader.rst
/fastdds/api_reference/dds_pim/subscriber/datareaderlistener.rst
Expand Down
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/dds_pim/topic/topic.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Topic
=====

.. toctree::
:titlesonly:

/fastdds/api_reference/dds_pim/topic/topicdatatype.rst
/fastdds/api_reference/dds_pim/topic/typesupport.rst
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Dynamic Language Binding
========================

.. toctree::
:titlesonly:

/fastdds/api_reference/dds_pim/xtypes/annotationdescriptor.rst
/fastdds/api_reference/dds_pim/xtypes/dynamicdata.rst
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Type Representation
===================

.. toctree::
:titlesonly:

/fastdds/api_reference/dds_pim/xtypes/typeobjectregistry.rst
/fastdds/api_reference/dds_pim/xtypes/typeobjectutils.rst
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/dds_pim/xtypes/xtypes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ XTypes
======

.. toctree::
:titlesonly:

/fastdds/api_reference/dds_pim/xtypes/dynamic_types.rst
/fastdds/api_reference/dds_pim/xtypes/exception.rst
Expand Down
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/log/colors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ Colors
A collection of macros for ease the stream coloring.

.. toctree::
:titlesonly:

/fastdds/api_reference/log/colors/colors.rst
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/log/log.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ LOG
*eProsima Fast DDS* Logging Module API

.. toctree::
:titlesonly:

/fastdds/api_reference/log/colors.rst
/fastdds/api_reference/log/file_consumer.rst
Expand Down
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/rtps/attributes/attributes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Attributes
============

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/attributes/BuiltinAttributes
/fastdds/api_reference/rtps/attributes/c_default_RTPSParticipantAllocationAttributes
Expand Down
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/rtps/builtin/data/data.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ Builtin data
============

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/builtin/data/ContentFilterProperty
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ BinaryProperty
===============

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/BinaryProperty/BinaryProperty
/fastdds/api_reference/rtps/common/BinaryProperty/BinaryPropertyHelper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CDRMessage
===============

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/CDRMessage_t/CDRMessage_t
/fastdds/api_reference/rtps/common/CDRMessage_t/defines
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CacheChange
===============

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/CacheChange/CacheChange_t
/fastdds/api_reference/rtps/common/CacheChange/ChangeForReader_t
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ EntityId
===============

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/EntityId_t/const_values
/fastdds/api_reference/rtps/common/EntityId_t/defines
/fastdds/api_reference/rtps/common/EntityId_t/EntityId_t
/fastdds/api_reference/rtps/common/EntityId_t/operators

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ FragmentNumber
===============

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/FragmentNumber/FragmentNumber_t
/fastdds/api_reference/rtps/common/FragmentNumber/FragmentNumberSet_t
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/rtps/common/Guid/guid_toc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Guid
===============

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/Guid/c_Guid_Unknown
/fastdds/api_reference/rtps/common/Guid/GUID_t
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ GuidPrefix
===============

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/GuidPrefix_t/c_GuidPrefix_Unknown
/fastdds/api_reference/rtps/common/GuidPrefix_t/GuidPrefix_t
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ InstanceHandle
===============

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/InstanceHandle/c_InstanceHandle_Unknown
/fastdds/api_reference/rtps/common/InstanceHandle/InstanceHandle_t
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Locator
===============

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/Locator/defines
/fastdds/api_reference/rtps/common/Locator/IsAddressDefined
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ MatchingInfo
------------

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/MatchingInfo/MatchingInfo
/fastdds/api_reference/rtps/common/MatchingInfo/MatchingStatus
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Property
===============

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/Property/Property
/fastdds/api_reference/rtps/common/Property/PropertyHelper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ RemoteLocators
===============

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/RemoteLocators/operators
/fastdds/api_reference/rtps/common/RemoteLocators/RemoteLocatorList
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ SequenceNumber
---------------

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/SequenceNumber/c_SequenceNumber_Unknown
/fastdds/api_reference/rtps/common/SequenceNumber/operators
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ SerializedPayload
-------------------

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/SerializedPayload/defines
/fastdds/api_reference/rtps/common/SerializedPayload/SerializedPayload_t
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/rtps/common/Time_t/time_toc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Time_t
--------------------

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/Time_t/const_values
/fastdds/api_reference/rtps/common/Time_t/defines
Expand Down
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/rtps/common/Token/token_toc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Token
--------------------

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/Token/AuthenticatedPeerCredentialToken
/fastdds/api_reference/rtps/common/Token/DataHolder
Expand Down
1 change: 1 addition & 0 deletions docs/fastdds/api_reference/rtps/common/Types/types_toc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Types
--------------------

.. toctree::
:titlesonly:

/fastdds/api_reference/rtps/common/Types/BuiltinEndpointSet_t
/fastdds/api_reference/rtps/common/Types/const_values
Expand Down
Loading

0 comments on commit d6eeda0

Please sign in to comment.