-
Notifications
You must be signed in to change notification settings - Fork 21
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.
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
CON-323: Manually synchronize branches in preparation to unify them; delete left-over files #183
Open
Alxe
wants to merge
84
commits into
master
Choose a base branch
from
alejnp/unify_develop_and_master_branches
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+4
−7,912
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* CON-177: Added support/tests for addition sampleinfo fields * CON-177: Added unit tests for sample/view/instance state * CON-177: PR Feedback - Added possible values of the strings to the docs - Updated unit tests with new possible values
* CON-188: docs + tests * CON-188: Functionality changes - Always return all fields (not None for non-key members) - updated docs + tests for this * CON-188: PR feedback Applied the feedback from the JS review * CON-188: Fix typo
* Performance tests for Python get/set sequence * Separated tests * Update test/python/test_rticonnextdds_performance.py Co-authored-by: Alex Campos <[email protected]> * You can now set the number of iterations on the command line * Minor changes Co-authored-by: Alex Campos <[email protected]>
* Added additional performance tests that use native DD API * Disable tests by default
* CON-209: Test support for multiple urls in connector creation * CON-209: Update docs
* CON-163: Added a (currently failing) unit test for license error * CON-163: Updated copyright * CON-163: PR feedback
… for python connector
… missed in first update
* CON-215: Added release notes * CON-215: Fixed issue IDs * CON-215: Fix IDs again * CON-215: Fix title indentation * CON-215: Added notes from CON-188 * CON-215: Added more issues * CON-215: Fix codeblock * CON-215: Add issue # * Apply suggestions from code review * Update docs/release_notes.rst * CON-215: release notes review and edits, and a few other tweaks to capitalization in other files * Update docs/release_notes.rst * CON-215: Reverted LICENSE.pdf Co-authored-by: rkorte <[email protected]>
…rstand the differences
…pam-changes PLATFORMS-1925 connector py pam changes
Feature/con 194 python api ref
With this, License.pdf should not longer show up as changed on Windows
* CORE-11069: Replaced deprecated XML tags in documentation and public XML * CORE-11069: Also update test XML
* CON-174: Handle ARMV8 arch * CON-174: Minor edit * Fix string * CON-174: Handle other arm strings - Handle all of aarch64, aarch64_be, armv8b, armv8l - Also load the library for (deprecated) armv6
Feature/con 211
Co-authored-by: Sam Raeburn <[email protected]>
* Updated the loading of native libraries * - Update common libs - Remove support for 32 bit Win + Linux * Updated native libs * Explicitly load the nddsc and nddscore libraries on Windows Co-authored-by: Sam Raeburn <[email protected]>
* CON-221: Added docs for ability to load libs * PR feedback * PR Feedback * working on LICENSE.pdf and gitattributes Co-authored-by: rkorte <[email protected]> Co-authored-by: Sam Raeburn <[email protected]>
* Updated platforms in the relaese notes * Removed symbol from ARMv7 platform name Co-authored-by: Sam Raeburn <[email protected]>
CON-252: updating links from current to 6.1.1, py
CORE-11993: canonical url added for python connector
Feature/con 251 py
CON-251: added missing release note and fixed canonical formatting error
CON-234: fixing link to Python API reference
…Updated Supported Platforms to match JS release notes.
CON-251: applying PAM updates to supported platforms
CON-257: adding Lua vulnerability assessment to Connector 1.2.0 doc
* Update rticonnextdds-connector submodule to point to master (6.0.1) * Update rticonnextdds-connector submodule to point to master (6.0.1) - fix previous commit * Update project tags * Fix error in setup.py * Release/connector/1.1.0 (#75) * Feature/con 177 (#38) * CON-177: Added support/tests for addition sampleinfo fields * CON-177: Added unit tests for sample/view/instance state * CON-177: PR Feedback - Added possible values of the strings to the docs - Updated unit tests with new possible values * CON-188: docs + tests (#40) * CON-188: docs + tests * CON-188: Functionality changes - Always return all fields (not None for non-key members) - updated docs + tests for this * CON-188: PR feedback Applied the feedback from the JS review * CON-188: Fix typo * Performance tests for Python get/set sequence (#41) * Performance tests for Python get/set sequence * Separated tests * Update test/python/test_rticonnextdds_performance.py Co-authored-by: Alex Campos <[email protected]> * You can now set the number of iterations on the command line * Minor changes Co-authored-by: Alex Campos <[email protected]> * Feature/native dd perf (#42) * Added additional performance tests that use native DD API * Disable tests by default * CON-188: Fixed code block in docs (#44) * Feature/con 209 (#43) * CON-209: Test support for multiple urls in connector creation * CON-209: Update docs * CON-163: Added a unit test for license error (fix is in core) (#46) * CON-163: Added a (currently failing) unit test for license error * CON-163: Updated copyright * CON-163: PR feedback * CON-212: Added CONTRIBUTING.md file (#45) * CON-214: Added test for creating Connector with participant_qos (#47) * CON-211: updating all links to other docs per new doc tree structure, for python connector * CON-211: fixed a couple of link-related issues in connector-py that I missed in first update * CON-211: updated title of core GSG to remove "Core Libraries" * CORE-10744: Update documentation for new default system resources (#50) * CON-215: Added release notes (#48) * CON-215: Added release notes * CON-215: Fixed issue IDs * CON-215: Fix IDs again * CON-215: Fix title indentation * CON-215: Added notes from CON-188 * CON-215: Added more issues * CON-215: Fix codeblock * CON-215: Add issue # * Apply suggestions from code review * Update docs/release_notes.rst * CON-215: release notes review and edits, and a few other tweaks to capitalization in other files * Update docs/release_notes.rst * CON-215: Reverted LICENSE.pdf Co-authored-by: rkorte <[email protected]> * CON-194: added statement and link to Python API doc so users can understand the differences * CON-188: Updates instance support section of features.rst (#53) * PLATFORMS-1925. Updated supported platforms to match Hercules PAM. * PLATFORMS-1925. Added trademark symbols. * Introduce EOL normalisation (#58) With this, License.pdf should not longer show up as changed on Windows * Feature/core 11069 (#59) * CORE-11069: Replaced deprecated XML tags in documentation and public XML * CORE-11069: Also update test XML * Feature/con 174 armv8 (#57) * CON-174: Handle ARMV8 arch * CON-174: Minor edit * Fix string * CON-174: Handle other arm strings - Handle all of aarch64, aarch64_be, armv8b, armv8l - Also load the library for (deprecated) armv6 * GREEN-2058: Fixed string checking when setting invalid my_enum from dict (#61) * GREEN-2058: Added tests for new functionality in DD Parser (#62) Co-authored-by: Sam Raeburn <[email protected]> * Feature/dir renames (#64) * Updated the loading of native libraries * - Update common libs - Remove support for 32 bit Win + Linux * Updated native libs * Explicitly load the nddsc and nddscore libraries on Windows Co-authored-by: Sam Raeburn <[email protected]> * CON-221: Added docs for ability to load libs (#55) * CON-221: Added docs for ability to load libs * PR feedback * PR Feedback * working on LICENSE.pdf and gitattributes Co-authored-by: rkorte <[email protected]> Co-authored-by: Sam Raeburn <[email protected]> * Updated platforms in the relaese notes (#65) * Updated platforms in the relaese notes * Removed symbol from ARMv7 platform name Co-authored-by: Sam Raeburn <[email protected]> * Feature/update version (#66) * Update README for 1.1.0 preview * Update setup.py for version 1.1.0 preview * Updated version in setup.py to 1.1.0.rc2 * Updated submodule to use commit feature/update-libs-internal-rel Co-authored-by: Sam Raeburn <[email protected]> * Updated version in documentation to 1.1.0.rc2 (#67) * Updated version in documentation to 1.1.0.rc2 * - Now possible to do rti.Connector.version() to obtain current version * - Updated blue colour used in docs - Updated docs version to 1.1.0 - Removed version() API - needs further thought before implementation Co-authored-by: Sam Raeburn <[email protected]> * Update release_notes.rst Add 16.04 Ubuntu * Updated the Platforms notes to include Ubuntu 16.04 (x64 + ARMv8) (#68) * Updated the Platforms notes to include Ubuntu 16.04 (x64 + ARMv8) * Added support for ARMv8 to whats new 1.1.0 * fix typo Co-authored-by: Sam Raeburn <[email protected]> * CON-211: testing all links to core docs, fixing few that were broken - python * CON-194: python changes: update copyright page and copyright year tagline * Accept 32-bit archs if libraries are swapped * HERCULES-186: updates to licenses doc for python * HERCULES-186: modified lua and json-parser in Connector doc python * Document dependency on Connext version for dynamic libs (#74) * Document dependency on Connext version for dynamic libs * - PR feedback to clarify wording - Adding missing sentence from release notes about Connext DDS version * PR feedback Co-authored-by: Sam Raeburn <[email protected]> * Update setup.py for version 1.1.0 * Update native libraries to version 6.1.0 Co-authored-by: Alex Campos <[email protected]> Co-authored-by: rkorte <[email protected]> Co-authored-by: Adelle Olson <[email protected]> Co-authored-by: rkorte <[email protected]> Co-authored-by: Sam Raeburn <[email protected]> * Release/connector/1.1.1 (#91) * CON-245: version 1.1.1 release note announcement for py * CON-245: udpating release version to 1.1.1 for py * Update version strings and connector for 1.1.1 (#89) * Update native libraries to version 1.1.1 * Update version strings to 1.1.1 * Update version string to 1.1.1.rc1, and revert release_notes.rst * revert version string changes in docs/ * feature/support-308 (#99) * Update native libraries to version 1.1.1 * Update version strings to 1.1.1 * Update version string to 1.1.1.rc1, and revert release_notes.rst * revert version string changes in docs/ * #fix SUPPORT-308 -- final version string to 1.1.1 for production server Co-authored-by: rkorte <[email protected]> Co-authored-by: rkorte <[email protected]> * Final merge of release 1.2.0 to master. (#134) * 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 <[email protected]> (cherry picked from commit 00164ce) * 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 <[email protected]> Co-authored-by: Sam Raeburn <[email protected]> Co-authored-by: Alex Campos <[email protected]> (cherry picked from commit 9ffde89) * 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 <[email protected]> Co-authored-by: rkorte <[email protected]> (cherry picked from commit 62a573c) * CON-92: Handle case in obtaining version where Connector was git cloned (#87) (#88) (cherry picked from commit 6a0ff37) * 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 d7935e2) * #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 77399ad) * 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 <[email protected]> * #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) Co-authored-by: Sam <[email protected]> Co-authored-by: adelleolson <[email protected]> Co-authored-by: rkorte <[email protected]> Co-authored-by: rkorte <[email protected]> Co-authored-by: Bob Garrow <[email protected]> * CON-274: update native libs Co-authored-by: Alex Campos <[email protected]> Co-authored-by: rkorte <[email protected]> Co-authored-by: Adelle Olson <[email protected]> Co-authored-by: rkorte <[email protected]> Co-authored-by: Sam Raeburn <[email protected]> Co-authored-by: Bob Garrow <[email protected]> Co-authored-by: Bob Garrow <[email protected]>
* CON-276: Updated documentation for supported Windows * CON-276: Fix notes * CON-276: Updated PAM
* 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 ddafab4) * CON-272: Add deprecation notice Co-authored-by: rkorte <[email protected]>
…op_and_master_branches
Alxe
changed the title
Manually synchronize branches in preparation to unify them; delete left-over files
CON-323: Manually synchronize branches in preparation to unify them; delete left-over files
Oct 4, 2024
ManuelJNunez
approved these changes
Oct 9, 2024
alexcamposruiz
requested changes
Oct 14, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
update README.md: mention why the branch is empty, and mention that the support branch is where updates are made.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We're merging
develop
intomaster
to havemaster
be up-to-date. Once this is completed, we'll delete the previous branch and keep a single one for the "current" state of the repository.Because the "final" state is one where Connector for Python has been deprecated and since removed, I'm also removing any left-over file. Users can still choose to go to different branches, but
master
(or whatever its final name may be) will be effectively frozen.