From 0b713f0a82f5cd9b7333e415bb414cdf2f0f83b9 Mon Sep 17 00:00:00 2001 From: Bob Garrow Date: Thu, 15 Dec 2022 10:17:14 -0800 Subject: [PATCH] CON-285 merge docs and setup.py info back to master. (#160) * CON-92, CON-200 merge to 1.1.1 (#85) * CON-92: Added the ability to obtain current version of Connector (#80) * CON-92: Added the ability to obtain current version of Connector 3 static methods have been added to Connector - version - Provides the current version of Connector - native_library_version - Provides the current version of native libraries being used by Connector - native_library_build_string - Provides the build ID of the native libraries being used by Connector * CON-92: Made the _from_native method static * CON-92: Fixed docs * CON-92: Changed output Now a single function that provides a string conatining the API version + core versions. For example: RTI Connector for Python, version 1.1.0 NDDSCORE_BUILD_6.1.0_20210531T122009Z_RTI_UNKNOWN NDDSC_BUILD_6.1.0_20210531T122009Z_RTI_UNKNOWN RTICONNECTOR_BUILD_6.1.0_20210531T122009Z_RTI_UNKNOWN * CON-92: Renamed version to get_version * CON-92: Remove ConnectorVersion from docs Co-authored-by: Sam Raeburn (cherry picked from commit 00164ce6409de28cd82c7867ce0a5bd8f987bff2) * CON-200: Fix double free segfault (#79) * CON-200: Fix double free segfault * Update test/python/test_rticonnextdds_connector.py Co-authored-by: Alex Campos Co-authored-by: Sam Raeburn Co-authored-by: Alex Campos (cherry picked from commit 9ffde89afd8fa65a6c1843eea54e76ff5d97ea5e) * Feature/con 191 (#83) (#86) * CON-191: Added tests for 64-bit int conversions * CON-191: Added docs * CON-191: writer's edits to doc changes (py) * CON-191: Updated tests and docs to reflect new behaviour I noticed in the native libraries that we weren't being consistent with the limits. Sometimes we were not checking for v < -LUA_MAX_INT, and sometimes we were not being consistent with the use of > vs >=. I have rectified this, the supported behaviour is as follows: When setting via set_number, we allow |v| < 2^53. When getting via get_number, we allow |v| <= 2^53. The reason for the discrepancy between the set and get, is that when we have a value in set_number, it has already been cast to a double, so although 2^53 is perfectly representable, we do not know if the original value was larger (e.g., 2^53 + 1 would appear as 2^53). Also extended tests to ensure that all of the various supported ways of setting / getting 64-bit values work as expected: - allow setting large values via __setitem__ (string or number), set_string, set_dictionary - allow getting large values via __getitem__ (returned as float or int depending on size), get_string, get_dictionary * CON-191: Completed tests + docs Co-authored-by: Sam Raeburn Co-authored-by: rkorte (cherry picked from commit 62a573cf15ca3bf085a5d1a63520005938c6f510) * CON-92: Handle case in obtaining version where Connector was git cloned (#87) (#88) (cherry picked from commit 6a0ff37573bd4384d00c7a3e4af5a28c962a808a) * PLATFORMS-2289. Adding macOS 11 to Connector PY release notes. * HMAINT-235: Handle case where build ID contains 4 digits (#96) (#97) (cherry picked from commit d7935e283ee96c42d1737e9529b75edc83e7e6a5) * #fix HMAINT-202 -- update libraries for 1.2.0, set version for test.py (#100) * HMAINT-202 -- correct rc1 version string (#103) * HMAINT-202 -- set version to rc2 for testing (#107) * CON-252: updating links from current to 6.1.1, py * CORE-11993: canonical url added for python connector * CON-251: connector py release notes for 6.1.1/1.2.0 * CON-251: 1.2.0 doc changes - Move warning from 64-bit number section to release notes - Add link to get_version API * CON-251: added missing release note and fixed canonical formatting error * CON-253: Document bug in numpy on aarch64 (#113) (#114) (cherry picked from commit 77399ad830d7b5d4286d366107a30036cb5554aa) * CON-234: fixing link to Python API reference * CON-234: changed python api link to go to github * HMAINT-202 -- set version string to 1.2.0 (#118) * CON-251: applying PAM updates to supported platforms * CON-251. Corrected the Jira # mentioned for CON-200 in what's fixed. Updated Supported Platforms to match JS release notes. * CON-251. Corrected wording of what's tested. * #fix HMAINT-202 -- new connector libraries for python, base on DDS 6.1.1 (20211203) (#121) Co-authored-by: Bob Garrow * #fix HMAINT-202 -- corrected library git references for py, base on DDS 6.1.1 (20211203) (#122) * #fix HMAINT-202 -- clean out old libraries for py. (#123) * CON-257: adding Lua vulnerability assessment to Connector 1.2.0 doc * CON-257: updating vulnerability assessment section for python * CON-257: updated release notes and copyright * #fix HMAINT-202 -- new connector libraries for python, base on DDS 6.1.1 (20220309, bkprt) (#129) * #fix HMAINT-202 -- final version string 1.2.0 (#132) * CON-276: Updated loading of redist + commit of submodule (#144) (#146) (cherry picked from commit a0e4f41786952c2297af850227e29d62ba6999de) * Feature/con 272 276 support (#148) * CON-276: Updated documentation for supported Windows (#147) * CON-276: Updated documentation for supported Windows * CON-276: Fix notes * CON-276: Updated PAM (cherry picked from commit 0cbb5e109f69d0727f63e0d73f27d64bff9daf85) * Merge pull request #140 from rticommunity/doc/PY-44-readme PY-44: adding deprecation notice to connector-py README files only (cherry picked from commit ddafab4202fe6360ad50a4b5920c175d934f396b) (cherry picked from commit 1be36f44042c309bcdc43ea9e79fef2a1973238d) * CON-276 CON-272: Cherry-picked changes to docs * CON-276: Fix release notes Co-authored-by: rkorte <36715349+rkorte@users.noreply.github.com> * CON-280-support, change version number to 1.2.2 in support/connector/1.2.0 (#150) * #fix CON-280-support, change version number to 1.2.2 * #fix CON-280-support, add rc suffix to version string ... Co-authored-by: Bob Garrow * CON-278 -- rc2 with libraries from 20221028 (#154) Co-authored-by: Bob Garrow * HMAINT-747: updating 1.2.0 version to 1.2.2 and 6.1.1 URLs to 6.1.2 * #fix CON-279 -- rc3 for new 20221111 libs ... (#157) Co-authored-by: Bob Garrow * CON-278 -- final version string for 1.2.2 (#159) Co-authored-by: Bob Garrow Co-authored-by: Sam Co-authored-by: adelleolson Co-authored-by: rkorte Co-authored-by: rkorte <36715349+rkorte@users.noreply.github.com> Co-authored-by: Bob Garrow --- docs/conf.py | 4 +- docs/configuration.rst | 20 +++--- docs/connector.rst | 4 +- docs/data.rst | 2 +- docs/features.rst | 64 +++++++++---------- docs/index.rst | 11 +++- docs/input.rst | 2 +- docs/intro.rst | 4 +- docs/release_notes.rst | 64 ++++++++++++------- rticonnextdds-connector | 2 +- .../rticonnextdds_connector.py | 2 +- setup.py | 2 +- 12 files changed, 103 insertions(+), 78 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 5d5a09e..1df22af 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,8 +22,8 @@ author = 'Real-Time Innovations, Inc.' # The full version, including alpha/beta/rc tags -version = '1.2.0' -release = '1.2.0' +version = '1.2.2' +release = '1.2.2' master_doc = 'index' diff --git a/docs/configuration.rst b/docs/configuration.rst index 3fec80d..c0ee079 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -13,7 +13,7 @@ that includes the definition of domains, *DomainParticipants*, *Topics*, *Connector* uses the XML schema defined by RTI's `XML-Based Application Creation feature -`__. +`__. .. hint:: The *Connext DDS* C, C++, Java and .NET APIs can also load the same XML files @@ -77,11 +77,11 @@ and ``shapesize``: Types are associated with *Topics*, as explained in the next section, :ref:`Domain Library`. .. hint:: - You can define your types in IDL and convert them to XML with `rtiddsgen `__. + You can define your types in IDL and convert them to XML with `rtiddsgen `__. For example: ``rtiddsgen -convertToXml MyTypes.idl`` For more information about defining types, see -`Creating User Data Types with XML `__ +`Creating User Data Types with XML `__ in the *RTI Connext DDS Core Libraries User's Manual*. For more information about accessing data samples, see :ref:`Accessing the data`. @@ -91,10 +91,10 @@ Domain library A domain library is a collection of domains. A domain specifies: - * A `domain id `__. + * A `domain id `__. * A set of registered types (from a subset of the types in ````). A registered type can have a local name. - * A set of `topics `__, + * A set of `topics `__, which are used by *DataReaders* and *DataWriters*. .. code-block:: xml @@ -108,7 +108,7 @@ A domain library is a collection of domains. A domain specifies: For more information about the format of a domain library, see -`XML-Based Application Creation: Domain Library `__. +`XML-Based Application Creation: Domain Library `__. Participant library ~~~~~~~~~~~~~~~~~~~ @@ -142,12 +142,12 @@ an :class:`Input`, as described in :ref:`Reading data (Input)`. For more information about the format of a participant library, see `XML-Based Application Creation: Participant Library -`__. +`__. Quality of service ~~~~~~~~~~~~~~~~~~ -All DDS entities have an associated `quality of service (QoS) `__. +All DDS entities have an associated `quality of service (QoS) `__. There are several ways to configure it. You can define a QoS profile and make it the default. The following example @@ -234,12 +234,12 @@ profile is equivalent to *MyQosProfile* above: You can read more in the *RTI Connext DDS Core Libraries User's Manual*, `Configuring QoS with XML -`__. +`__. Logging ^^^^^^^ -Logging can be configured as explained in `Configuring Logging via XML `__. +Logging can be configured as explained in `Configuring Logging via XML `__. For example, to increase the logging verbosity from the default (ERROR) to WARNING, define a ``qos_profile`` with the attribute diff --git a/docs/connector.rst b/docs/connector.rst index 1369e60..9a0ba37 100644 --- a/docs/connector.rst +++ b/docs/connector.rst @@ -22,7 +22,7 @@ To create a new :class:`Connector`, pass an XML file and a configuration name: connector = rti.Connector("MyParticipantLibrary::MyParticipant", "ShapeExample.xml"); The XML file defines your types, QoS profiles, and DDS Entities. *Connector* -uses the XML schema of `RTI's XML-Based Application Creation `__. +uses the XML schema of `RTI's XML-Based Application Creation `__. The previous code loads the ```` named *MyParticipant* in the ```` named *MyParticipantLibrary*, which is defined in the @@ -40,7 +40,7 @@ When you create a :class:`Connector`, the DDS *DomainParticipant* that you selec and all its contained entities (*Topics*, *Subscribers*, *DataReaders*, *Publishers*, *DataWriters*) are created. -For more information about the DDS entities, see `Core Concepts `__ +For more information about the DDS entities, see `Core Concepts `__ in the *RTI Connext DDS Core Libraries User's Manual*. .. note:: diff --git a/docs/data.rst b/docs/data.rst index 77a7279..ea45750 100644 --- a/docs/data.rst +++ b/docs/data.rst @@ -432,7 +432,7 @@ To clear a member, set it to ``None`` explicitly:: For more information about optional members in DDS, see -`Optional Members `__ +`Optional Members `__ in the *Extensible Types Guide*. Accessing unions diff --git a/docs/features.rst b/docs/features.rst index be0b5b9..318563b 100644 --- a/docs/features.rst +++ b/docs/features.rst @@ -20,7 +20,7 @@ General features * - Feature - Level of support - Notes - * - `Quality of Service (QoS) `__ + * - `Quality of Service (QoS) `__ - Partial - Most QoS policies are supported because they can be configured in XML, but those that are designed to be mutable can't be changed in *Connector*. QoS policies that require @@ -50,19 +50,19 @@ General features order to enable an `Input` only when :meth:`Connector.get_input` is called. * Property - Properties can be set in XML, but they can't be looked up in *Connector* - `Topic Qos `__ is not supported in *Connector*. Use DataReader QoS and DataWriter QoS directly. - * - `Entity Statuses `__ + `Topic Qos `__ is not supported in *Connector*. Use DataReader QoS and DataWriter QoS directly. + * - `Entity Statuses `__ - Partial - Only :meth:`Input.wait` (data available), :meth:`Input.wait_for_publications`, and :meth:`Output.wait_for_subscriptions` are supported. - * - `Managing Data Instances `__ + * - `Managing Data Instances `__ - Partial - On an ``Output``, it is possible to dispose or unregister an instance (see :meth:`Output.write`). Instances are automatically registered when first written. On an ``Input`` the instance state can be obtained, alongside the key fields of a disposed instance (see :ref:`Accessing key values of disposed samples`). Instance handles are not exposed. - * - `Application Acknowledgment `__ + * - `Application Acknowledgment `__ - Partial - *DDS_APPLICATION_AUTO_ACKNOWLEDGMENT_MODE* is supported. If enabled, when a call to :meth:`Input.take` or :meth:`Input.read` is followed by another call, the second one automatically acknowledges the samples read in the first one. *DDS_APPLICATION_EXPLICIT_ACKNOWLEDGMENT_MODE* is not supported. - * - `Request-Reply `__ + * - `Request-Reply `__ - Partial - The correlation between two samples can be established at the application level: @@ -70,21 +70,21 @@ General features * The *Replier* application receives the *request* sample, obtains the ``identity`` (A), from ":attr:`SampleIterator.info` and writes a new sample with ``related_sample_identity=A`` (the *reply* sample) * The *Requester* application receives the *reply* sample, and correlates the ``related_sample_identity`` from :attr:`SampleIterator.info` with the ``identity`` it used in the first step. - * - `Topic Queries `__ + * - `Topic Queries `__ - Partial - ``Input`` doesn't have the API to create a *TopicQuery*, but in the configuration file a *data_writer* can enable support for *TopicQuery* so other *Connext DDS Subscribers* can query the *Connector Publisher*. - * - `Zero Copy Transfer Over Shared Memory `__ + * - `Zero Copy Transfer Over Shared Memory `__ - Not supported - Only available in C and C++. - * - `Built-in Topics `__ + * - `Built-in Topics `__ - Not supported - API not available. - * - `Transport Plugins `__ + * - `Transport Plugins `__ - Partial - The built-in transports can be configured in XML. * - Add-on Libraries - (such as `Monitoring `__, - `Security Plugins `__ ) + (such as `Monitoring `__, + `Security Plugins `__ ) - Supported - See :ref:`Loading Connext DDS Add-On Libraries`. @@ -98,19 +98,19 @@ Features related to sending data * - Feature - Level of support - Notes - * - `Waiting for Acknowledgments `__ + * - `Waiting for Acknowledgments `__ - Supported - See :meth:`Output.wait`. - * - `Coherent Sets `__ + * - `Coherent Sets `__ - Not supported - API not available. - * - `Flow Controllers `__ + * - `Flow Controllers `__ - Partial - Most functionality is available via XML QoS configuration. - * - `Asserting Liveliness Manually `__ + * - `Asserting Liveliness Manually `__ - Not supported - API not available. - * - `Collaborative DataWriters `__ + * - `Collaborative DataWriters `__ - Limited - The virtual GUID can be set per writer in XML, but not per sample. @@ -124,19 +124,19 @@ Features related to receiving data * - Feature - Level of support - Notes - * - `Content-Filtered Topics `__ + * - `Content-Filtered Topics `__ - Partial - - `Configurable in XML `__ but it can't be modified after creation - * - `Sample Info `__ + - `Configurable in XML `__ but it can't be modified after creation + * - `Sample Info `__ - Partial - See :attr:`SampleIterator.info` - * - `Query Conditions `__ + * - `Query Conditions `__ - Not supported - API not available - * - `Group-Ordered Access `__ + * - `Group-Ordered Access `__ - Not supported - API not available - * - `Waiting for Historical Data `__ + * - `Waiting for Historical Data `__ - Not supported - API not available @@ -150,17 +150,17 @@ Features related to the type system * - Feature - Level of support - Notes - * - `DDS type system `__ + * - `DDS type system `__ - Supported - *Connector* can use any DDS type. Types are defined in XML. - * - `Type extensibility `__ + * - `Type extensibility `__ - Supported - *Connector* supports type extensibility, including mutable types in the XML definition of types. It also supports type-consistency enforcement and sample-assignability enforcement; these checks are performed by the *RTI Connext DDS* Core. - * - `Optional members `__ + * - `Optional members `__ - Supported - See :ref:`Accessing optional members`. - * - `Default values `__ + * - `Default values `__ - Supported - For example, to declare a default value for a member:: @@ -174,7 +174,7 @@ Features related to the type system ``Input`` from a *Publisher* whose type is compatible, but doesn't have the field *my_int*, the value you receive will be 20. - * - `Unbounded data `__ + * - `Unbounded data `__ - Supported - To declare an unbounded sequence or string, set its max length to *-1*:: @@ -221,7 +221,7 @@ Features related to the type system - * - `FlatData Language Binding `__ + * - `FlatData Language Binding `__ - Not supported - However, an ``Input`` can receive data published by other *Connext DDS* applications that use FlatData. @@ -230,8 +230,8 @@ Loading Connext DDS Add-On Libraries *Connector* supports features that require the loading of additional *Connext DDS* libraries, such as -`Monitoring `__ -and `Security Plugins `__. +`Monitoring `__ +and `Security Plugins `__. The Monitoring and Security plugins are configured in XML, as described in the previous links. @@ -255,4 +255,4 @@ configure your environment so that Connector can load these additional libraries Each version of Connector can only load add-on libraries from its corresponding Connext DDS release. You can see this correspondence in the :ref:`release notes`. For example, Connector 1.1.0 can only - load Connext DDS 6.1.0 add-on libraries. + load Connext DDS 6.1.0 add-on libraries. \ No newline at end of file diff --git a/docs/index.rst b/docs/index.rst index a307725..eada869 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -20,6 +20,15 @@ You can learn how to use *RTI Connector* by reading the following sections, whic include examples and detailed API reference. You can also find a specific type or function in the :ref:`genindex`. +.. note:: + + With the introduction of the RTI Connext Python API in *RTI Connext* + 7.0.0, *Connector for Python* is deprecated and will be removed in a + future release, once the Connext Python API is fully supported. You are + encouraged to try the + `Connext Python API `__ (experimental in 7.0.0). + + Table of Contents ================= @@ -41,5 +50,5 @@ Table of Contents * :ref:`search` To learn more about *RTI Connext DDS*, see the -`RTI Connext DDS Getting Started Guide `__. +`RTI Connext DDS Getting Started Guide `__. More documentation is available in the `RTI Community Portal `__. \ No newline at end of file diff --git a/docs/input.rst b/docs/input.rst index 721369d..f1d3301 100644 --- a/docs/input.rst +++ b/docs/input.rst @@ -131,7 +131,7 @@ See :meth:`SampleIterator.info` for the list of available meta-data fields. *Connext DDS* can produce samples with invalid data, which contain meta-data only. For more information about this, see `Valid Data Flag -`__ +`__ in the *RTI Connext DDS Core Libraries User's Manual*. These samples indicate a change in the instance state. Samples with invalid data still provide the following information: diff --git a/docs/intro.rst b/docs/intro.rst index cc5f19c..9343a71 100644 --- a/docs/intro.rst +++ b/docs/intro.rst @@ -10,9 +10,7 @@ data distribution efficient and robust. At its core is the world's leading ultra-high performance, distributed networking databus. *RTI Connector* is a family of simplified APIs for publishing and subscribing -to the *Connext DDS* Databus in programming languages such as Python and JavaScript. -(RTI also offers a more comprehensive `Python API `__, -which is experimental.) +to the *Connext DDS* Databus in programming languages such as Python and JavaScript. .. note:: diff --git a/docs/release_notes.rst b/docs/release_notes.rst index b0345df..2e03a80 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -18,37 +18,66 @@ runs on most Windows®, Linux® and macOS® platforms. * Red Hat® Enterprise Linux 7, 7.3, 7.5, 7.6, 8 (x64) * SUSE® Linux Enterprise Server 12 SP2 (x64) * Ubuntu® 18.04 (x64, Arm v7, Arm v8) - * Ubuntu 20.04 LTS (x64) + * Ubuntu 20.04, 22.04 LTS (x64) **macOS** - * macOS 10.13-10.15 (x64) + * macOS 10.13-10.15, 12 (x64) * macOS 11 (x64 and Arm v8 tested via x64 libraries) **Windows** - * Windows 10 (x64) - * Windows Server 2012 R2 (x64) + * Windows 10, 11 (x64) * Windows Server 2016 (x64) - *Connector* is supported in other languages in addition to Python, see the `main Connector repository `__. +Version 1.2.2 +----------------- + +What's New in 1.2.2 +^^^^^^^^^^^^^^^^^^^ + +*Connector* 1.2.2 is built on `RTI Connext DDS 6.1.2 `__. + +Native Windows libraries updated to Visual Studio 2015 +"""""""""""""""""""""""""""""""""""""""""""""""""""""" +.. CON-276 + +Previously, the native libraries shipped with Connector were built using Visual +Studio 2013 (and accompanied by Microsoft's mscvr120 redistributable). These +libraries are now built using Visual Studio 2015. The redistributable that is +shipped has been updated accordingly. + + +Vulnerability Assessments +------------------------- +Internally, *Connector* relies on Lua. RTI has assessed the current version of +Lua used by *Connector*, version 5.2, and found that *Connector* is not currently +affected by any of the publicly disclosed vulnerabilities in Lua 5.2. + + +Previous Releases +----------------- + +Version 1.2.0 +^^^^^^^^^^^^^ + What's New in 1.2.0 -------------------- +""""""""""""""""""" *Connector* 1.2.0 is built on `RTI Connext DDS 6.1.1 `__. New Platforms -^^^^^^^^^^^^^ ++++++++++++++ *Connector* has been validated on macOS 11 (Big Sur) systems on x64 and Arm v8 CPUs (via x64 libraries). New API makes it easier to query what version of Connector is being used -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .. CON-92 A new API, :meth:`rticonnextdds_connector.Connector.get_version`, has been added that provides the caller @@ -56,10 +85,10 @@ with the version of *Connector* and the version of the native libraries being us What's Fixed in 1.2.0 ---------------------- +""""""""""""""""""""" Error logged when accessing string longer than 128 bytes -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Previously, on an input, when accessing a string longer than 128 bytes, the following error was printed: @@ -74,7 +103,7 @@ the string. The message is no longer printed. Deleting same Connector object twice may have resulted in segmentation fault -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ A segmentation fault may have occurred when the same *Connector* object was deleted twice. This issue has been resolved. @@ -82,7 +111,7 @@ deleted twice. This issue has been resolved. Support added for handling large 64-bit integers -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +++++++++++++++++++++++++++++++++++++++++++++++++ Support has been improved for both getting and setting large (greater than 2^53) 64-bit values. See :ref:`section-access-64-bit-integers` for more information. @@ -92,17 +121,6 @@ inputs on other systems. [RTI Issue ID CON-190] - -Vulnerability Assessments -------------------------- -Internally, *Connector* relies on Lua. RTI has assessed the current version of -Lua used by *Connector*, version 5.2, and found that *Connector* is not currently -affected by any of the publicly disclosed vulnerabilities in Lua 5.2. - - -Previous Releases ------------------ - Version 1.1.1 ^^^^^^^^^^^^^ *Connector* 1.1.1 is built on *RTI Connext DDS* 6.1.0.3, which fixes several diff --git a/rticonnextdds-connector b/rticonnextdds-connector index 81b374f..6ec486f 160000 --- a/rticonnextdds-connector +++ b/rticonnextdds-connector @@ -1 +1 @@ -Subproject commit 81b374f2f2e86127d1e03be9e9ceadcd21d4ae69 +Subproject commit 6ec486f11dca86dcd94bb127a519cb3eb3af268a diff --git a/rticonnextdds_connector/rticonnextdds_connector.py b/rticonnextdds_connector/rticonnextdds_connector.py index 4316199..75463c6 100644 --- a/rticonnextdds_connector/rticonnextdds_connector.py +++ b/rticonnextdds_connector/rticonnextdds_connector.py @@ -139,7 +139,7 @@ def __init__(self): # pylint: disable=too-many-statements directory = "win-x64" libname = "rtiddsconnector" post = "dll" - additional_lib = "msvcr120" + additional_lib = "vcruntime140.dll" is_windows = True else: raise RuntimeError("This platform ({0}) is not supported".format(osname)) diff --git a/setup.py b/setup.py index 2183759..0626630 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ # Versions should comply with PEP440. For a discussion on single-sourcing # the version across setup.py and the project code, see # https://packaging.python.org/en/latest/single_source_version.html - version='1.2.0', + version='1.2.2', description='RTI Connector for Python', long_description=long_description,