Merge pull request #37 from PelionIoT/release-2.5.0

Release 2.5.0
PelionIoT · Jan 3, 2023 · 1155547 · 1155547
2 parents 8e9591e + 6767bdd
commit 1155547
Show file tree

Hide file tree

Showing 28 changed files with 334 additions and 212 deletions.
diff --git a/.github/workflows/pr-checker.yml b/.github/workflows/pr-checker.yml
@@ -0,0 +1,126 @@
+name: PR-check
+run-name: ${{ github.actor }} PR checker
+on: [push]
+jobs:
+  run_tox_on_ubuntu22:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.7'
+      - run: python -m pip install wheel --user
+      - run: python -m pip install pipx-in-pipx --user
+      - run: pipx install tox
+      # No py36 available in ubuntu 22.04, skip it
+      - run: tox
+  run_tox_on_ubuntu20:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.7'
+      - run: python -m pip install wheel --user
+      - run: python -m pip install pipx-in-pipx --user
+      - run: pipx install tox
+      - run: tox
+
+  run_tox_on_windows2022:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.7'
+      - run: python -m pip install wheel --user
+      - run: python -m pip install pipx-in-pipx --user
+      - run: pipx install tox
+      - run: tox
+
+  run_tox_on_windows2019:
+    runs-on: windows-2019
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.7'
+      - run: wmic os get osarchitecture
+      - run: python -m pip install wheel --user
+      - run: python -m pip install pipx-in-pipx --user
+      - run: pipx install tox
+      - run: tox
+
+  run_tox_on_mac:
+    runs-on: macos-11
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.7'
+      - run: python -m pip install wheel --user
+      - run: python -m pip install pipx-in-pipx --user
+      - run: pipx install tox
+      - run: tox
+
+# We are not ready for this yet...
+#  run-pysh-check:
+#    runs-on: ubuntu-22.04
+#    steps:
+#      - uses: actions/checkout@v3
+#      # Install pyshcheck tooling
+#      - run: sudo apt install pycodestyle pydocstyle black
+#      # git instead of rules to use access token
+#      - run: git config --global url."https://${{ secrets.ACCESS_TOKEN }}@github.com/".insteadOf "[email protected]:"
+#      - run: git config --global url."https://${{ secrets.ACCESS_TOKEN }}@github".insteadOf "https://github"
+#      - run: git config --list
+#      # Linux coreutils is already installed wc -command can be found.
+#      - run: git clone [email protected]:PelionIoT/scripts-internal.git
+#      #- run: git clone https://github.com/PelionIoT/scripts-internal.git
+#      - run: echo "." >scripts-internal/.nopyshcheck
+#      - run: .github/workflows/pysh-checker.sh ${{ github.event.repository.default_branch }} ${{ github.ref_name }}
diff --git a/.pylintrc b/.pylintrc
@@ -60,16 +60,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use "--disable=all --enable=classes
 # --disable=W".
-disable=print-statement,
-        parameter-unpacking,
-        unpacking-in-except,
-        old-raise-syntax,
-        backtick,
-        long-suffix,
-        old-ne-operator,
-        old-octal-literal,
-        import-star-module-level,
-        non-ascii-bytes-literal,
+disable=
         raw-checker-failed,
         bad-inline-option,
         locally-disabled,
@@ -78,67 +69,6 @@ disable=print-statement,
         useless-suppression,
         deprecated-pragma,
         use-symbolic-message-instead,
-        apply-builtin,
-        basestring-builtin,
-        buffer-builtin,
-        cmp-builtin,
-        coerce-builtin,
-        execfile-builtin,
-        file-builtin,
-        long-builtin,
-        raw_input-builtin,
-        reduce-builtin,
-        standarderror-builtin,
-        unicode-builtin,
-        xrange-builtin,
-        coerce-method,
-        delslice-method,
-        getslice-method,
-        setslice-method,
-        no-absolute-import,
-        old-division,
-        dict-iter-method,
-        dict-view-method,
-        next-method-called,
-        metaclass-assignment,
-        indexing-exception,
-        raising-string,
-        reload-builtin,
-        oct-method,
-        hex-method,
-        nonzero-method,
-        cmp-method,
-        input-builtin,
-        round-builtin,
-        intern-builtin,
-        unichr-builtin,
-        map-builtin-not-iterating,
-        zip-builtin-not-iterating,
-        range-builtin-not-iterating,
-        filter-builtin-not-iterating,
-        using-cmp-argument,
-        eq-without-hash,
-        div-method,
-        idiv-method,
-        rdiv-method,
-        exception-message-attribute,
-        invalid-str-codec,
-        sys-max-int,
-        bad-python3-import,
-        deprecated-string-function,
-        deprecated-str-translate-call,
-        deprecated-itertools-function,
-        deprecated-types-field,
-        next-method-defined,
-        dict-items-not-iterating,
-        dict-keys-not-iterating,
-        dict-values-not-iterating,
-        deprecated-operator-function,
-        deprecated-urllib-function,
-        xreadlines-attribute,
-        deprecated-sys-function,
-        exception-escape,
-        comprehension-escape,
         too-many-arguments,
         too-many-locals,
         missing-docstring,
@@ -333,13 +263,6 @@ max-line-length=100
 # Maximum number of lines in a module.
 max-module-lines=1000
 
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,
-               dict-separator
-
 # Allow the body of a class to be on the same line as the declaration if body
 # contains single statement.
 single-line-class-stmt=no

diff --git a/PELION_LICENSE → IZUMA_NETWORKS_LICENSE b/PELION_LICENSE → IZUMA_NETWORKS_LICENSE
@@ -1,5 +1,6 @@
 # ----------------------------------------------------------------------------
 # Copyright 2021 Pelion
+# Copyright 2022-2023 Izuma Networks
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/README.md b/README.md
@@ -49,19 +49,27 @@ We recommend installing the `manifest-tool` Python package in a isolated
 
 **Prerequisites:**
 
-* [Python 3.6 or higher](https://www.python.org/downloads/).
+* [Python 3.7 or higher](https://www.python.org/downloads/).
+    * Python 3.11 support is not in place yet.
 * [pip (Python Package Installer)](https://pip.pypa.io/en/stable/).
 * Internet connectivity
 
 ```
 pip install manifest-tool
 ```
 
+**NOTE!** If your system has only Python 3.6 or older - you must an older version of this tool.
+
+```
+pip install manifest-tool==2.4.1
+```
+
+
 ### Installing from local source tree
 
 **Prerequisites:**
 
-* [Python 3.6 or later](https://www.python.org/downloads/).
+* [Python 3.7 or later](https://www.python.org/downloads/).
 * [pip (Python Package Installer)](https://pip.pypa.io/en/stable/).
 * Native toolchain:
     * GCC/Clang for Linux/MacOS.
@@ -132,7 +140,7 @@ describing the update type.
     Configuration file format:
     ```yaml
     vendor:  # One of "domain" or "vendor-id" fields are expected.
-      domain: pelion.com  # FW owner domain. Used to generate a vendor UUID.
+      domain: izumanetworks.com  # FW owner domain. Used to generate a vendor UUID.
                           # Expected to include a dot (".").
       # OR
       vendor-id: fa6b4a53d5ad5fdfbe9de663e4d41ffe  # Valid vendor UUID.
@@ -194,7 +202,7 @@ describing the update type.
 
     ```yaml
     vendor:
-      domain: pelion.com
+      domain: izumanetworks.com
     device:
       model-name: Smart Flip-flops
     priority: 1
@@ -496,7 +504,7 @@ configuration file.
 
 ```shell
 manifest-dev-tool create \
-    --payload-url http://test.pdmc.pelion.com?fileId=1256 \
+    --payload-url http://test.pdmc.izumanetworks.com?fileId=1256 \
     --payload-path new_fw.bin \
     --fw-version 1.2.3 \
     --component-name MAIN \
@@ -516,7 +524,7 @@ configuration file.
 
 ```shell
 manifest-dev-tool create-v1 \
-    --payload-url http://test.pdmc.pelion.com?fileId=1256 \
+    --payload-url http://test.pdmc.izumanetworks.com?fileId=1256 \
     --payload-path new-fw.bin \
     --output update-manifest.bin
 ```

diff --git a/build_manylinux_wheels_entry_point.sh b/build_manylinux_wheels_entry_point.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # ----------------------------------------------------------------------------
-# Copyright 2020-2021 Pelion
+# Copyright 2020-2022 Izuma Networks
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## 2.5.0
+- Izuma branding, contact email/author updated, Cloud documentation links updated.
+- Timeouts for `requests.put/post/delete` operations.
+- Pinned down critical Python module versions in `dev-requirements.txt`.
+- Module name fixes for some tests.
+- Removed obsolete options from `.pylintrc`.
+- Support for / testing on Python 3.6 dropped.
+- Support for / testing on Python 3.10 added.
+
+## 2.4.1
+
+- Aarch64 support.
+
 ## 2.4.0
 - Add `manifest-package-tool`:
   - New tool to generate combined package files for combined updates.

diff --git a/dev-README.md b/dev-README.md
@@ -7,10 +7,11 @@
 
 Example:
 ```shell
+$ pyenv install 3.10.0
+$ pyenv install 3.9.0
 $ pyenv install 3.8.0
 $ pyenv install 3.7.5
-$ pyenv install 3.6.9
-$ pyenv local 3.8.0 3.7.5 3.6.9
+$ pyenv local 3.9.0 3.8.0 3.7.5
 $ python --version
 Python 3.8.0
 ```
@@ -61,7 +62,7 @@ Execute `tox -e py38` to test only the python3.8 environment.
 ```shell
 $ pyenv local 3.7.5
 $ python setup.py bdist_wheel
-$ pyenv local 3.6.9
+$ pyenv local 3.8.9
 $ python setup.py bdist_wheel
 ```
 do the same on each platform (Windows, Linux, macOS) per Python
@@ -112,7 +113,7 @@ the release creation time.
 1. Run `tox` on Windows, Linux and Mac.
 1. Create release on GitHub.
 1. Run `build_manylinux_wheels.sh` on Linux. The dist folder should contain 4 wheels for every Linux distribution (16 wheels overall).
-1. Gather wheels and tar.gz from all `dist` folder into one dist folder:
+1. Gather all the wheels and 1 tar.gz from all `dist` folders from 3 OSes (Windows, Linux, Mac) into one dist folder:
    ```
    scp $USER@<source base path>/manifest-tool/dist/*.whl dist/
    ```

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,8 +1,8 @@
-pytest
+pytest==6.2.5
 pytest-mock
 pytest-cov
 tox
-pylint
+pylint==2.13.9
 pycodestyle
 coverage
 wheel

diff --git a/dev_init.bat b/dev_init.bat
@@ -1,5 +1,5 @@
 @REM ----------------------------------------------------------------------------
-@REM Copyright 2021 Pelion
+@REM Copyright 2021-2022 Izuma Networks
 @REM
 @REM SPDX-License-Identifier: Apache-2.0
 @REM

diff --git a/dev_init.sh b/dev_init.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 # ----------------------------------------------------------------------------
-# Copyright 2019-2021 Pelion
+# Copyright 2019-2022 Izuma Networks
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/manifesttool/__init__.py b/manifesttool/__init__.py
@@ -1,5 +1,6 @@
 # ----------------------------------------------------------------------------
 # Copyright 2019-2021 Pelion
+# Copyright (c) 2022 Izuma Networks
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -16,4 +17,4 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------
 
-__version__ = "2.4.1"
+__version__ = "2.5.0"