ARMmbed · junichikatsu · Jan 11, 2019 · Jan 11, 2019 · Jan 11, 2019 · Jan 11, 2019
diff --git a/.github/issue_template.md b/.github/issue_template.md
@@ -19,7 +19,7 @@
 <!--
     Required
     Add detailed description of what you are reporting.
-    Good example: https://os.mbed.com/docs/latest/reference/workflow.html
+    Good example: https://os.mbed.com/docs/mbed-os/latest/contributing/workflow.html
     Things to consider sharing:
     - What target does this relate to?
     - What toolchain (name + version) are you using?

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,15 +1,15 @@
 ### Description
 
-<!-- 
+<!--
     Required
-    Add here detailed changes summary, testing results, dependencies 
-    Good example: https://os.mbed.com/docs/latest/reference/workflow.html (Pull request template)
+    Add here detailed changes summary, testing results, dependencies
+    Good example: https://os.mbed.com/docs/mbed-os/latest/contributing/workflow.html (Pull request template)
 -->
 
 
 ### Pull request type
 
-<!-- 
+<!--
     Required
     Please add only one X to one of the following types. Do not fill multiple types (split the pull request otherwise).
     Please note this is not a GitHub task list, indenting the boxes or changing the format to add a '.' or '*' in front
@@ -24,3 +24,17 @@
     [ ] Test update
     [ ] Breaking change
 
+### Reviewers
+
+<!--
+    Optional
+    Request additional reviewers with @username
+-->
+
+### Release Notes
+
+<!--
+    Optional
+    In case of breaking changes, functionality changes or refactors, please add release notes here. 
+    For more information, please see [the contributing guidelines](https://os.mbed.com/docs/mbed-os/latest/contributing   /workflow.html#pull-request-types).
+-->
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,19 @@
+# Copyright (c) 2013-2018 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the License); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 language: python
 python: 2.7
 
@@ -30,8 +46,8 @@ before_install:
   # Setup ppa to make sure arm-none-eabi-gcc is correct version
   - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
   - sudo add-apt-repository -y ppa:deadsnakes/ppa
-  # Fix for "The following signatures were invalid: KEYEXPIRED 1515625755" failed". See https://github.com/travis-ci/travis-ci/issues/9037
-  - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
+  # workaround for https://travis-ci.community/t/then-sudo-apt-get-update-failed-public-key-is-not-available-no-pubkey-6b05f25d762e3157-in-ubuntu-xenial/1728
+  - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 762E3157
   # Loop until update succeeds (timeouts can occur)
   - travis_retry $(! sudo apt-get update 2>&1 |grep Failed)
 
@@ -69,7 +85,6 @@ matrix:
         - doxygen doxyfile_options 2>&1
         # Once Mbed OS has been fixed, enable the full test by replacing the top line with this:
         # - ( ! doxygen doxyfile_options 2>&1 | grep . )
-
         # Assert that all binary libraries are named correctly
         # The strange command below asserts that there are exactly 0 libraries
         # that do not start with lib
@@ -90,12 +105,20 @@ matrix:
       install:
         # Install dependencies
         - sudo apt-get install gcc-arm-embedded
-        - pip install -r requirements.txt
-        - pip install pytest pylint hypothesis mock coverage coveralls
-        # Print versions we use
-
         - arm-none-eabi-gcc --version
+        # Add additional dependencies specific for testing
         - python --version
+        - |-
+          tr -d ' ' >> requirements.txt <<< "
+          mock==2.0.0
+          pytest==3.3.0
+          pylint>=1.9,<2
+          hypothesis>=3,<4
+          coverage>=4.5,<5
+          coveralls>=1.5,<2
+          "
+        # ... and install.
+        - pip install -r requirements.txt
         - pip list --verbose
       script:
         # Run local testing on tools
@@ -106,57 +129,64 @@ matrix:
       after_success:
         # Coverage for tools
         - coveralls
-        # Report success since we have overridden default behaviour
+        # Report success since we have overridden default behavior
         - bash -c "$STATUS" success "Local $NAME testing has passed"
 
-#    - <<: *tools-pytest
-#      env: NAME=tools-py3.5
-#      python: 3.5
-#
-#    - <<: *tools-pytest
-#      env: NAME=tools-py3.6
-#      python: 3.6
+    - env:
+        - NAME=doxy-spellcheck
+
+      install:
+        - sudo apt-get install aspell
+
+      script:
+        # Run local testing on header file doxy
+        - ./tools/test/travis-ci/doxy-spellchecker/spell.sh drivers
+        - ./tools/test/travis-ci/doxy-spellchecker/spell.sh platform
+        - ./tools/test/travis-ci/doxy-spellchecker/spell.sh events
+        - ./tools/test/travis-ci/doxy-spellchecker/spell.sh rtos
+        - ./tools/test/travis-ci/doxy-spellchecker/spell.sh features/netsocket
+
+      after_success:
+        # Coverage for tools
+        - coveralls
+        # Report success since we have overridden default behavior
+        - bash -c "$STATUS" success "Local $NAME testing has passed"
+
+    - <<: *tools-pytest
+      env: NAME=tools-py3.5
+      python: 3.5
+
+    - <<: *tools-pytest
+      env: NAME=tools-py3.6
+      python: 3.6
+
+    - <<: *tools-pytest
+      env: NAME=tools-py3.7
+      python: 3.7
+      dist: xenial
 
     - env:
         - NAME=astyle
       install:
-      - curl -L0 http://mbed-os.s3-eu-west-1.amazonaws.com/builds/deps/astyle_3.1_linux.tar.gz --output astyle.tar.gz;
-        mkdir -p BUILD && tar xf astyle.tar.gz -C BUILD;
-        pushd BUILD/astyle/build/gcc;
-        make;
-        export PATH=$PWD/bin:$PATH;
-        popd;
-      - astyle --version
+        - >-
+          curl -L0 https://mbed-os.s3-eu-west-1.amazonaws.com/builds/deps/astyle_3.1_linux.tar.gz --output astyle.tar.gz;
+          mkdir -p BUILD && tar xf astyle.tar.gz -C BUILD;
+          cd BUILD/astyle/build/gcc;
+          make;
+          export PATH=$PWD/bin:$PATH;
+          cd -
+        - astyle --version
+        # Fetch remaining information needed for branch comparison
+        - git fetch --all --unshallow --tags
+        - git fetch origin "${TRAVIS_BRANCH}"
       script:
-        # only changed files this time
-        git diff --name-only --diff-filter=d $TRAVIS_BRANCH | grep '.*\.\(h\|c\|hpp\|cpp\)$' | fgrep -v -f .astyleignore | xargs -n 100 -I {} bash -c "astyle -n --options=.astylerc \"{}\"" > astyle-files-changed.out;
-          if [ $(cat astyle-files-changed.out | grep Formatted | wc -l) -ne 0 ]; then
-            git --no-pager diff;
-            echo "";
-            echo "AStyle check failed, please fix style issues as shown above";
-            (exit 1);
-          else
-            echo "Coding style check OK";
-          fi
-      after_success:
-        # run astyle for all files on the branch
-        - git checkout -- .
-        - find -regex '.*\.\(h\|c\|hpp\|cpp\)$' -type f | fgrep -v -f .astyleignore | xargs -n 100 -I {} bash -c "astyle -n --options=.astylerc \"{}\"" > astyle-branch.out;
-        # update status if we succeeded, compare with master if possible
-        - |
-          CURR=$(cat astyle-branch.out | grep Formatted | wc -l)
-          PREV=$(curl -u "$MBED_BOT" https://github.com/api/repos/$TRAVIS_REPO_SLUG/status/master \
-              | jq -re "select(.sha != \"$TRAVIS_COMMIT\")
-                  | .statuses[] | select(.context == \"travis-ci/$NAME\").description
-                  | capture(\", (?<files>[0-9]+) files\").files" \
-              || echo 0)
+        - >-
+          git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
+            | ( grep '.\(c\|cpp\|h\|hpp\)$' || true ) \
+            | ( fgrep -v -f .astyleignore || true ) \
+            | while read file; do astyle -n --options=.astylerc "${file}"; done
+        - git diff --exit-code --diff-filter=d --color
 
-          STATUSM="Passed, ${CURR} files"
-          if [ "$PREV" -ne 0 ]
-          then
-              STATUSM="$STATUSM ($(python -c "print '%+d' % ($CURR-$PREV)") files)"
-          fi
-        - bash -c "$STATUS" success "$STATUSM"
     - env:
         - NAME=events
         - EVENTS=events
@@ -277,6 +307,22 @@ matrix:
     - env:
         - NAME=licence_check
       script:
-        - echo 'Checking that there is no GPL licence text in code'
-        - ! git grep -q --ignore-case "gnu general public";
-        - ! git grep -q --ignore-case "gnu library general public";
+        - >-
+          ! grep --recursive --max-count=100 --ignore-case --exclude .travis.yml \
+          "gnu general\|gnu lesser\|lesser general\|public license"
+
+    - env:
+        - NAME=include_check
+      script:
+        - echo 'Checking that there are no '#include "mbed.h"' in code where it should not be'
+        - |
+         ! git grep '^#include\s["'"']mbed.h['"'"]$' -- '*.c' '*.h' '*.cpp' '*.hpp' \
+             ':!*platform_mbed.h' ':!*TESTS/*' ':!TEST_APPS/' ':!UNITTESTS/' \
+             ':!*tests/*' ':!*targets/*' ':!*TARGET_*' ':!*unsupported/*'
+
+    - env:
+        - NAME=psa-autogen
+      script:
+        # Run SPM code generator and check that changes are not needed
+        - python tools/spm/generate_partition_code.py
+        - git diff --exit-code
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,4 +2,4 @@
 
 Mbed OS is an open-source, device software platform for the Internet of Things. Contributions are an important part of the platform, and our goal is to make it as simple as possible to become a contributor.
 
-To encourage productive collaboration, as well as robust, consistent and maintainable code, we have a set of guidelines for [contributing to Mbed OS](https://os.mbed.com/docs/latest/reference/contributing.html).
+To encourage productive collaboration, as well as robust, consistent and maintainable code, we have a set of guidelines for [contributing to Mbed OS](https://os.mbed.com/docs/mbed-os/latest/contributing/index.html).
diff --git a/LICENSE → LICENSE-apache-2.0.txt b/LICENSE → LICENSE-apache-2.0.txt
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,22 @@
+Unless specifically indicated otherwise in a file, files are licensed under the Apache 2.0 license,
+as can be found in: LICENSE-apache-2.0.txt
+
+Folders containing files under different permissive license than Apache 2.0 are listed below. Each folder should contain its own README file with license specified for its files. The original license text is included in those source files.
+
+- [cmsis](./cmsis) - MIT, BSD-3-Clause
+- [components/802.15.4_RF/mcr20a-rf-driver](./components/802.15.4_RF/mcr20a-rf-driver) - BSD-3-Clause
+- [features/cryptocell/FEATURE_CRYPTOCELL310](./features/cryptocell/FEATURE_CRYPTOCELL310) - ARM Object Code and Header Files License
+- [features/FEATURE_BOOTLOADER](./features/FEATURE_BOOTLOADER) - PBL
+- [features/FEATURE_BLE/targets](./features/FEATURE_BLE/targets) - BSD-style, PBL, MIT-style
+- [features/lorawan](./features/lorawan) - Revised BSD
+- [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style
+- [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause
+- [features/storage](./features/storage) - BSD-style, MIT
+- [features/netsocket/emac-drivers](./features/netsocket/emac-drivers) - BSD-style
+- [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT
+- [features/unsupported](./features/unsupported) - MIT-style, BSD-style
+- [rtos](./rtos) - MIT
+- [drivers](./drivers) - MIT
+- [TESTS/mbed_hal/trng/pithy](./TESTS/mbed_hal/trng/pithy) - BSD-3-Clause
+- [tools/data/rpc](./tools/data/rpc) - MIT
+- [targets](./targets) - PBL, BSD-style, MIT-style, Zlib-style, Public-domain
diff --git a/README.md b/README.md
@@ -29,9 +29,11 @@ The [release notes](https://os.mbed.com/releases) detail the current release. Yo
 
 ## License and contributions 
 
-The software is provided under [Apache-2.0 license](LICENSE). Contributions to this project are accepted under the same license. Please see [contributing.md](CONTRIBUTING.md) for more info. 
+The software is provided under the [Apache-2.0 license](LICENSE-apache-2.0.txt). Contributions to this project are accepted under the same license. Please see [contributing.md](CONTRIBUTING.md) for more information.
 
-This project contains code from other projects. The original license text is included in those source files. They must comply with our [license guide](https://os.mbed.com/docs/latest/reference/license.html)
+This project contains code from other projects. The original license text is included in those source files. They must comply with our [license guide](https://os.mbed.com/docs/latest/reference/license.html).
+
+Folders containing files under different permissive license than Apache 2.0 are listed in the [LICENSE](LICENSE) file.
 
 ## Getting started for developers
 

diff --git a/TESTS/host_tests/crash_reporting.py b/TESTS/host_tests/crash_reporting.py
@@ -60,7 +60,7 @@ def test_steps(self):
         wait_after_reset = wait_after_reset if wait_after_reset is not None else DEFAULT_CYCLE_PERIOD
 
         #Wait 2 seconds for system to init
-        time.sleep(2.0)
+        time.sleep(7.0)
         #self.send_kv(MSG_KEY_SYNC, MSG_VALUE_DUMMY)
         self.send_kv(MSG_KEY_DEVICE_ERROR, MSG_VALUE_DUMMY)
         time.sleep(5.0)

diff --git a/TESTS/host_tests/rtc_calc_auto.py b/TESTS/host_tests/rtc_calc_auto.py
@@ -117,7 +117,7 @@ def _verify_timestamp(self, key, value, timestamp):
             self.send_kv("passed", str(response))
         else:
             self.send_kv("failed", 0)
-            print "expected = %d, result = %d" %  (expected_timestamp , actual_timestamp)
+            print("expected = %d, result = %d" %  (expected_timestamp , actual_timestamp))
 
         # calculate next date
         if (self.first):
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		Mbed OS is an open-source, device software platform for the Internet of Things. Contributions are an important part of the platform, and our goal is to make it as simple as possible to become a contributor.

		To encourage productive collaboration, as well as robust, consistent and maintainable code, we have a set of guidelines for [contributing to Mbed OS](https://os.mbed.com/docs/latest/reference/contributing.html).
		To encourage productive collaboration, as well as robust, consistent and maintainable code, we have a set of guidelines for [contributing to Mbed OS](https://os.mbed.com/docs/mbed-os/latest/contributing/index.html).