Merge branch 'release-0.14.2'

CODE_OF_CONDUCT.rst

@@ -0,0 +1,85 @@
+
+Our Pledge
+""""""""""
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our
+project and our community a harassment-free experience for everyone,
+regardless of age, body size, disability, ethnicity, gender identity and
+expression, level of experience, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
+
+
+Our Standards
+"""""""""""""
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political
+  attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or
+  electronic address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+
+Our Responsibilities
+""""""""""""""""""""
+
+Project maintainers are responsible for clarifying the standards of
+acceptable behavior and are expected to take appropriate and fair
+corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit,
+or reject comments, commits, code, wiki edits, issues, and other
+contributions that are not aligned to this Code of Conduct, or to ban
+temporarily or permanently any contributor for other behaviors that they
+deem inappropriate, threatening, offensive, or harmful.
+
+.. _code_of_conduct_scope:
+
+Scope
+"""""
+
+This Code of Conduct applies both within project spaces and in public
+spaces when an individual is representing the project or its community.
+Examples of representing a project or community include using an
+official project e-mail address, posting via an official social media
+account, or acting as an appointed representative at an online or
+offline event. Representation of a project may be further defined and
+clarified by project maintainers.
+
+
+Enforcement
+"""""""""""
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may
+be reported by contacting the project team at rafcon@dlr.de.
+All complaints will be reviewed and investigated and will result in a
+response that is deemed necessary and appropriate to the circumstances.
+The project team is obligated to maintain confidentiality with regard to
+the reporter of an incident. Further details of specific enforcement
+policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in
+good faith may face temporary or permanent repercussions as determined
+by other members of the project's leadership.
+
+
+Attribution
+"""""""""""
+
+This Code of Conduct is adapted from the `Contributor
+Covenant <https://www.contributor-covenant.org/>`__, version 1.4, available at
+https://www.contributor-covenant.org/version/1/4/ <https://www.contributor-covenant.org/version/1/4/>`__

CONTRIBUTING.md

@@ -0,0 +1,10 @@
+
+# Contributing to RAFCON
+
+Everybody is encouraged to contribute to the RAFCON project. However, collaboration needs some guidelines.
+
+For instructions on how to contribute, see our [development guidelines](https://rafcon.readthedocs.io/en/latest/development/development.html).
+
+Please note that we have a [code of conduct](https://rafcon.readthedocs.io/en/latest/development/development.html#code-of-conduct), please follow it in all your interactions with the project.
+
+In order to be able to change the license of RAFCON to another open source license, we need you to sign our CLA when contributing to RAFCON, either by you as [individual](./CLA_individuals.rst) or by your [organisation/company](./CLA_entities.rst).

RMC-Jenkinsfile

@@ -5,37 +5,24 @@ pipeline {
 
     parameters {
         string(name: 'tox_args', defaultValue: '-v', description: 'Arguments passed to tox besides the environment name', )
-        string(name: 'pytest_args', defaultValue: '-vx --timeout 0 -m "(core or gui or share_elements) and not unstable and not user_input"', description: 'Arguments passed to pytest')
+        string(name: 'pytest_args', defaultValue: '-vx -p no:timeout -m "(core or gui or share_elements) and not unstable and not user_input"', description: 'Arguments passed to pytest')
     }
 
     environment {
-        PATH = "/home_local/l_buildb/.local/bin:/opt/python/osl42-x86_64/python2/default/bin:/opt/python/osl42-x86_64/python3/default/bin:$PATH"
+        PATH = "/opt/python/osl42-x86_64/python2/default/bin:/opt/python/osl42-x86_64/python3/default/bin:$PATH"
         LD_LIBRARY_PATH = "/opt/python/osl42-x86_64/python2/default/lib:/opt/python/osl42-x86_64/python3/default/lib:$LD_LIBRARY_PATH"
         TOX_LIMITED_SHEBANG = 1
         // Allows 1st build of a project to succeed, workaround for https://issues.jenkins-ci.org/browse/JENKINS-41929
         tox_args = "${params.tox_args}"
         pytest_args = "${params.pytest_args}"
     }
 
-    options {
-        timestamps()
-    }
-
     stages {
 
-        stage('Prepare tox') {
-            steps {
-                sh 'printenv | sort'
-                lock("prepare-tox") {
-                    sh 'pip3 install -q --prefix="/home_local/l_buildb/.local" tox~=3.12.1'
-                }
-            }
-        }
-
         stage("Run tests") {
             // Run tests in parallel:
             // * wrapped in Xvfb for having an X server
-            // * specify tox environment (py27, py34, py36, coverage)
+            // * specify tox environment (py27, py36, coverage)
             // * run only stable tests
             // * collect pytest results in XML file
             parallel {
@@ -49,16 +36,6 @@ pipeline {
                     }
                 }
 
-                stage('Test Python 3.4') {
-                    steps {
-                        timeout(time: 10, unit: 'MINUTES') {
-                            wrap([$class: 'Xvfb', autoDisplayName: true, installationName: 'default', parallelBuild: true, screen: '1920x1200x24', timeout: 3]) {
-                                sh "tox -e py34 $tox_args -- $pytest_args --junitxml $WORKSPACE/pytest_py34_results.xml"
-                            }
-                        }
-                    }
-                }
-
                 stage('Test Python 3.6') {
                     steps {
                         timeout(time: 10, unit: 'MINUTES') {
@@ -70,6 +47,9 @@ pipeline {
                 }
 
                 stage('Test Python 2.7 Coverage') {
+                    when {
+                        anyOf { branch 'master'; branch 'develop' }
+                    }
                     steps {
                         timeout(time: 10, unit: 'MINUTES') {
                             wrap([$class: 'Xvfb', autoDisplayName: true, installationName: 'default', parallelBuild: true, screen: '1920x1200x24', timeout: 3]) {
@@ -113,7 +93,7 @@ pipeline {
                 conditionalCoverageTargets: '70, 0, 0', lineCoverageTargets: '80, 0, 0', methodCoverageTargets: '80, 0, 0',
                 maxNumberOfBuilds: 0,
                 enableNewApi: true,
-                failUnhealthy: false, failUnstable: false,
+                failUnhealthy: false, failUnstable: false, failNoReports: false,
                 sourceEncoding: 'ASCII', zoomCoverageChart: false
             publishHTML([allowMissing: false, alwaysLinkToLastBuild: false, keepAll: false, reportDir: 'build_doc', reportFiles: 'index.html', reportName: 'Documentation', reportTitles: 'RAFCON documentation'])
             rocketSend channel: 'rafcon-jenkins', avatar: 'https://rmc-jenkins.robotic.dlr.de/jenkins/static/ff676c77/images/headshot.png', message: ":tada: <$BUILD_URL|Build $BUILD_NUMBER> on branch '$BRANCH_NAME' *succeeded*! Commit: <https://rmc-github.robotic.dlr.de/common/rafcon/commit/$GIT_COMMIT|$GIT_COMMIT> :tada:", rawMessage: true

VERSION

@@ -1 +1 @@
-0.14.1
+0.14.2