Squashed release/connextdds-py/7.1.0 into master

rticommunity · Apr 11, 2023 · 74d9ba8 · 74d9ba8
1 parent 8b8780b
commit 74d9ba8
Show file tree

Hide file tree

Showing 138 changed files with 7,128 additions and 1,939 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,5 @@ rti_connext_dds-6.1.0/
 platform/
 package.cfg
 pyproject.toml
+!templates/pyproject.toml
 MANIFEST.in
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -19,7 +19,11 @@ def getConnextddsBranch() {
 pipeline{
     agent none
     options {
-      disableConcurrentBuilds()
+        disableConcurrentBuilds()
+        timeout(time: 8, unit: 'HOURS')
+    }
+    parameters {
+        booleanParam(defaultValue: false, description: 'Skip tests after building the wheel.', name: 'SKIP_TESTS')
     }
     stages{
         stage("Build Wheels"){
@@ -28,6 +32,9 @@ pipeline{
                     agent {
                         label "docker"
                     }
+                    environment {
+                        CIBW_TEST_SKIP = "${params.SKIP_TESTS ? "*" : ""}"
+                    }
                     stages{
                         stage("Build Wheels"){
                             steps{
@@ -55,7 +62,7 @@ pipeline{
                                         onlyIfSuccessful: true
                                     )
                                     script{
-                                        if (env.BRANCH_NAME == 'develop') {
+                                        if (env.BRANCH_NAME =~ /(develop|release\/connextdds-py\/.*)/) {
                                             docker.image('apihackers/twine').inside() {
                                                 withCredentials([
                                                     usernamePassword(
@@ -76,7 +83,7 @@ pipeline{
                             steps{
                                 script {
                                     docker.build("doc-image", '--build-arg USER_UID=$UID docs/').inside() {
-                                        sh('pip install wheelhouse/rti.connext-*-cp36*')
+                                        sh('pip install wheelhouse/rti.connext-*-cp38*')
                                         sh('make -C docs html')
                                         recordIssues(
                                             qualityGates: [
@@ -108,11 +115,48 @@ pipeline{
                                 }
                             }
                         }
-                        stage('Upload documentation') {
+                        stage('Upload Documentation') {
                             when {
-                                expression{
-                                    // Only upload documentation on release and develop branch
-                                    env.BRANCH_NAME =~ /^release\/connextdds-py\/(.*)/ || env.BRANCH_NAME == "develop"
+                                anyOf {
+                                    branch comparator: 'REGEXP', pattern: 'release/.*'
+                                    branch comparator: 'REGEXP', pattern: 'develop'
+                                    branch comparator: 'REGEXP', pattern: 'support/.*'
+                                }
+                            }
+                            steps {
+                                script {
+                                    def props = readProperties  file: 'setup.cfg'
+                                    def version = props['version']
+                                    def zipName = "connext-py-docs-${version}.zip"
+                                    zip zipFile: zipName, dir: "docs/build/html/"
+
+                                    // We add a .0 to the version to match connextdds version on artifactory
+                                    def artifactoryDirectory = "connext-ci/documentation/${version}.0/"
+                                    rtUpload (
+                                        serverId: getRtiArtifactoryServerId(),
+                                        spec:
+                                            """{
+                                            "files": [
+                                                {
+                                                    "pattern": "${zipName}",
+                                                    "target": "${artifactoryDirectory}",
+                                                    "props": "rti.artifact.kind=documentation;rti.product.name=connext-py;rti.product.version=${version}.0"
+                                                }
+                                            ]
+                                            }""",
+                                        failNoOp: true
+                                    )
+                                }
+
+                            }
+                        }
+                        stage('Publish Documentation') {
+                            // We also upload the documentation to the internal docserver.
+                            when {
+                                anyOf {
+                                    branch comparator: 'REGEXP', pattern: 'release/.*'
+                                    branch comparator: 'REGEXP', pattern: 'develop'
+                                    branch comparator: 'REGEXP', pattern: 'support/.*'
                                 }
                             }
                             steps {
@@ -130,17 +174,18 @@ pipeline{
                 }
                 stage("Build Darwin Wheels"){
                     agent {
-                        label "darwin17-ci"
+                        label "ci && darwin && clang12"
                     }
                     environment {
                         CI = 'true'
+                        CIBW_TEST_SKIP = "${params.SKIP_TESTS ? "*" : ""}"
                     }
                     steps{
                         checkout BbS(
                             branches: [[name: getConnextddsBranch()]],
                             credentialsId: 'bitbucket-build-credentials',
                             extensions: [
-                                [$class: 'CloneOption', honorRefspec: true, noTags: true, reference: '', shallow: true, timeout: 20],
+                                [$class: 'CloneOption', honorRefspec: true, noTags: true, reference: '', shallow: true, timeout: 50],
                                 [$class: 'RelativeTargetDirectory', relativeTargetDir: 'connextdds']
                             ],
                             id: '6a11cf7f-10be-4997-b48f-e9eebb9ddc2f',
@@ -164,7 +209,7 @@ pipeline{
                                 onlyIfSuccessful: true
                             )
                             script{
-                                if (env.BRANCH_NAME == 'develop') {
+                                if (env.BRANCH_NAME =~ /(develop|release\/connextdds-py\/.*)/) {
                                     withPythonEnv("python3") {
                                         sh "pip install twine"
                                         withCredentials([
@@ -190,6 +235,9 @@ pipeline{
                             alwaysPull true
                         }
                     }
+                    environment {
+                        CIBW_TEST_SKIP = "${params.SKIP_TESTS ? "*" : ""}"
+                    }
                     steps{
                         checkout BbS(
                             branches: [[name: getConnextddsBranch()]],
@@ -218,7 +266,7 @@ pipeline{
                                 onlyIfSuccessful: true
                             )
                             script{
-                                if (env.BRANCH_NAME == 'develop') {
+                                if (env.BRANCH_NAME =~ /(develop|release\/connextdds-py\/.*)/) {
                                     withPythonEnv("python") {
                                         bat "pip install twine"
                                         withCredentials([
@@ -244,6 +292,9 @@ pipeline{
                             alwaysPull true
                         }
                     }
+                    environment {
+                        CIBW_TEST_SKIP = "${params.SKIP_TESTS ? "*" : ""}"
+                    }
                     steps{
                         checkout BbS(
                             branches: [[name: getConnextddsBranch()]],
@@ -272,7 +323,7 @@ pipeline{
                                 onlyIfSuccessful: true
                             )
                             script{
-                                if (env.BRANCH_NAME == 'develop') {
+                                if (env.BRANCH_NAME =~ /(develop|release\/connextdds-py\/.*)/) {
                                     withPythonEnv("python") {
                                         bat "pip install twine"
                                         withCredentials([

diff --git a/LICENSE b/LICENSE
@@ -1,10 +1,27 @@
-(c) 2020 Copyright, Real-Time Innovations, Inc. (RTI) All rights reserved.
+Revised: 10/19/2022
 
-RTI grants Licensee a license to use, modify, compile, and create derivative
-works of the software solely for use with RTI Connext DDS.  Licensee may
-redistribute copies of the software provided that all such copies are subject
-to this license. The software is provided "as is", with no warranty of any
-type, including any warranty for fitness for any purpose. RTI is under no
-obligation to maintain or support the software.  RTI shall not be liable for
-any incidental or consequential damages arising out of the use or inability to
-use the software.
+(c) 2020 Copyright, Real-Time Innovations, Inc. (RTI). All rights reserved.
+RTI grants Licensee a license to use, modify, compile, and create derivative works of the accompanying software
+(“Software”) solely for use with a validly licensed copy of RTI Connext DDS. The Software is not open source but
+Licensee may redistribute copies of the Software provided that all such copies are subject to this license. All
+redistributions of the Software must retain the above copyright notice, the conditions specified herein, and the
+following disclaimers.
+The Software is provided "as is", and RTI disclaims, to the maximum extent permitted by applicable law, all express
+and implied representations, warranties and guarantees, including without limitation, the implied warranties of
+merchantability, fitness for any particular purpose, satisfactory quality, and non-infringement of third-party rights.
+RTI is under no obligation to maintain or support the software.
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL RTI BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING WITHOUT LIMITATION, NEGLIGENCE OR OTHERWISE) ARISING OUT OF THE USE OR
+INABILITY TO USE THE SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The Software may contain independent, third-party code that are subject to open source license terms and
+conditions (such code, “Open Source Software”, and the respective open source license terms and conditions, the
+“OSS License”). To the extent applicable, copies of the OSS License and any required notices for such Open Source
+Software are included in the legal_notices.txt file, other accompanying notices file, or the accompanying
+documentation. Nothing herein limits your rights under, or grants you rights that supersede, the OSS License
+applicable to the corresponding Open Source Software. It is your responsibility to ensure that your use of Open
+Source Software contained in the Software complies with the corresponding OSS License.
diff --git a/README.md b/README.md
@@ -11,15 +11,15 @@
 <p align="center">
   <em>A full Connext DDS binding for Python</em>
   <br />
-  <a href="https://community.rti.com/static/documentation/connext-dds/7.0.0/doc/api/connext_dds/api_python/index.html"><strong>Explore the documentation »</strong></a>
+  <a href="https://community.rti.com/static/documentation/connext-dds/7.1.0/doc/api/connext_dds/api_python/index.html"><strong>Explore the documentation »</strong></a>
   <br />
-  <a href="https://community.rti.com/static/documentation/connext-dds/7.0.0/doc/manuals/connext_dds_professional/getting_started_guide/index.html">Getting Started</a>
+  <a href="https://community.rti.com/static/documentation/connext-dds/7.1.0/doc/manuals/connext_dds_professional/getting_started_guide/index.html">Getting Started</a>
   ·
-  <a href="https://community.rti.com/static/documentation/connext-dds/7.0.0/doc/api/connext_dds/api_python/building.html">Install</a>
+  <a href="https://community.rti.com/static/documentation/connext-dds/7.1.0/doc/api/connext_dds/api_python/building.html">Install</a>
   ·
-  <a href="https://community.rti.com/static/documentation/connext-dds/7.0.0/doc/api/connext_dds/api_python/overview.html">API Overview</a>
+  <a href="https://community.rti.com/static/documentation/connext-dds/7.1.0/doc/api/connext_dds/api_python/overview.html">API Overview</a>
   ·
-  <a href="https://community.rti.com/static/documentation/connext-dds/7.0.0/doc/api/connext_dds/api_python/quick.html">API Reference</a>
+  <a href="https://community.rti.com/static/documentation/connext-dds/7.1.0/doc/api/connext_dds/api_python/quick.html">API Reference</a>
   ·
   <a href="https://github.com/rticommunity/rticonnextdds-examples">Examples</a>
 </p>
@@ -28,13 +28,13 @@
 
 ## Documentation
 
-- The [Connext Getting Started Guide](https://community.rti.com/static/documentation/connext-dds/7.0.0/doc/manuals/connext_dds_professional/getting_started_guide/index.html)
+- The [Connext Getting Started Guide](https://community.rti.com/static/documentation/connext-dds/7.1.0/doc/manuals/connext_dds_professional/getting_started_guide/index.html)
 helps you install the software and run your first RTI Connext Python application while learning general concepts of Connext.
 
-- The [Connext Python API Reference](https://community.rti.com/static/documentation/connext-dds/7.0.0/doc/api/connext_dds/api_python/index.html)
+- The [Connext Python API Reference](https://community.rti.com/static/documentation/connext-dds/7.1.0/doc/api/connext_dds/api_python/index.html)
 provides additional examples, an overview of the API and the API reference.
 
-- Additional Connext DDS documentation, including the User's Manual is available at the [Connext Community Portal](https://community.rti.com/static/documentation/).
+- Additional Connext DDS documentation, including the User's Manual is available at the [Connext Community Portal](https://community.rti.com/documentation/).
 
 ## Hello World Example
 
@@ -110,6 +110,6 @@ rti.asyncio.run(print_data())
 ## Building and Installing
 
 The Connext Python API is currently provided as buildable source. See
-[Building and Installing](https://community.rti.com/static/documentation/connext-dds/7.0.0/doc/api/connext_dds/api_python/building.html) in the Connext DDS API Reference for instructions.
+[Building and Installing](https://community.rti.com/static/documentation/connext-dds/7.1.0/doc/api/connext_dds/api_python/building.html) in the Connext DDS API Reference for instructions.
 
 A future release will provide a pre-built pip distribution.
diff --git a/docs/Dockerfile b/docs/Dockerfile
@@ -9,6 +9,6 @@ ARG USER_UID
 
 RUN adduser $USER_NAME -u $USER_UID
 COPY requirements.txt .
-RUN /opt/python/cp36-cp36m/bin/pip install -r requirements.txt
+RUN /opt/python/cp38-cp38/bin/pip install -r requirements.txt
 
-ENV PATH=/home/jenkins/.local/bin:/opt/python/cp36-cp36m/bin:$PATH
+ENV PATH=/home/jenkins/.local/bin:/opt/python/cp38-cp38/bin:$PATH
diff --git a/docs/source/building.rst b/docs/source/building.rst
@@ -12,11 +12,11 @@ Requirements
 - Python® 3.6 or newer
 - The following Python packages:
 
-  * For all systems: ``wheel setuptools cmake pybind11==2.8.1``
-  * Additionally, for Linux systems: ``patchelf``
-  * And for mac OS systems: ``delocate``
+  * For all systems: ``pip install wheel setuptools cmake pybind11==2.9.0``
+  * Additionally, for Linux systems: ``pip install patchelf``
+  * And for mac OS systems: ``pip install delocate``
 
-- A *Connext* 7.0.0 host and target installation (see the `Connext Getting Started Guide <https://community.rti.com/static/documentation/connext-dds/7.0.0/doc/manuals/connext_dds_professional/getting_started_guide/index.html>`_ for instructions on how to install Connext).
+- A *Connext* 7.1.0 host and target installation (see the `Connext Getting Started Guide <https://community.rti.com/static/documentation/connext-dds/7.1.0/doc/manuals/connext_dds_professional/getting_started_guide/index.html>`_ for instructions on how to install Connext).
 
 .. note::
 
@@ -45,7 +45,7 @@ Simple Installation
 
   .. code-block:: shell
 
-      $ python configure.py --nddshome /opt/rti_connext_dds-7.0.0 --jobs 4 x64Linux4gcc7.3.0
+      $ python configure.py --nddshome /opt/rti_connext_dds-7.1.0 --jobs 4 x64Linux4gcc7.3.0
 
   See :ref:`building:Advanced configuration` below for more options.
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -21,8 +21,8 @@
 project = 'RTI Connext Python API'
 copyright = '2022, Real-Time Innovations, Inc'
 author = 'Real-Time Innovations, Inc.'
-version = '7.0.0'
-release = '7.0.0'
+version = '7.1.0'
+release = '7.1.0'
 
 # -- General configuration ---------------------------------------------------