Merge branch 'master' into release/v6.0

Author: chunfantasy

README.md

@@ -47,8 +47,6 @@ This will also retrieve and install all additional required packages.
 
 **Note**: Please refer to the [pc-ble-driver-py PyPI installation note on Windows](https://github.com/NordicSemiconductor/pc-ble-driver-py#installing-from-pypi) if you are running nrfutil on this operating system.
 
-**Note**: When installing on macOS, you may need to add ` --ignore-installed six` when running pip. See [issue #79](https://github.com/NordicSemiconductor/pc-nrfutil/issues/79).
-
 ## Downloading precompiled Windows executable
 
 A Windows standalone executable (.exe) of nrfutil is available for download on the [Releases](https://github.com/NordicSemiconductor/pc-nrfutil/releases) page.

azure-pipelines.yml

@@ -1,81 +1,111 @@
 trigger:
-- test-azure
-- master
-- release/*
+  - test-azure
+  - master
+  - release/*
 
 jobs:
   # Linux
   - job: Linux
+    strategy:
+      matrix:
+        py36:
+          python_version: "3.6"
+        py37:
+          python_version: "3.7"
+        py38:
+          python_version: "3.8"
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: "ubuntu-16.04"
     steps:
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: '3.7'
-    - bash: |
-        pip install setuptools
-        pip install -r requirements-frozen.txt
-        python setup.py sdist
-      displayName: 'Build tar.gz with python 3.7'
-    - bash: |
-        pip install pyinstaller
-        pyinstaller nrfutil.spec
-      displayName: 'Build executable with python 3.7'
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: "$(python_version)"
+      - bash: |
+          pip install setuptools
+          pip install -r requirements-frozen.txt
+          python setup.py sdist
+        displayName: "Build tar.gz with python $(python_version)"
+      - bash: |
+          pip install https://github.com/pyinstaller/pyinstaller/archive/develop.tar.gz
+          pyinstaller nrfutil.spec
+        displayName: "Build executable with python $(python_version)"
 
   # macOS
   - job: macOS
+    strategy:
+      matrix:
+        py36:
+          python_version: "3.6"
+        py37:
+          python_version: "3.7"
+        py38:
+          python_version: "3.8"
     pool:
-      vmImage: 'macos-10.13'
+      vmImage: "macos-10.13"
     steps:
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: '3.7'
-    - bash: |
-        pip install setuptools
-        pip install -r requirements-frozen.txt
-        python setup.py sdist
-      displayName: 'Build tar.gz with python 3.7'
-    - bash: |
-        pip install pyinstaller
-        pyinstaller nrfutil.spec
-      displayName: 'Build executable with python 3.7'
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: "$(python_version)"
+      - bash: |
+          pip install setuptools
+          pip install -r requirements-frozen.txt
+          python setup.py sdist
+        displayName: "Build tar.gz with python $(python_version)"
+      - bash: |
+          pip install https://github.com/pyinstaller/pyinstaller/archive/develop.tar.gz
+          pyinstaller nrfutil.spec
+        displayName: "Build executable with python $(python_version)"
 
   # Windows
   - job: Windows
     strategy:
       matrix:
-        win32:
-          python_arch: 'x86'
-        win64:
-          python_arch: 'x64'
+        py36_win32:
+          python_version: "3.6"
+          python_arch: "x86"
+        py36_win64:
+          python_version: "3.6"
+          python_arch: "x64"
+        py37_win32:
+          python_version: "3.7"
+          python_arch: "x86"
+        py37_win64:
+          python_version: "3.7"
+          python_arch: "x64"
+        py38_win32:
+          python_version: "3.8"
+          python_arch: "x86"
+        py38_win64:
+          python_version: "3.8"
+          python_arch: "x64"
     pool:
-      vmImage: 'vs2017-win2016'
+      vmImage: "vs2017-win2016"
     steps:
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: '3.7'
-        architecture: '$(python_arch)'
-    - bash: |
-        pip install -r requirements-frozen.txt
-        python setup.py sdist
-      displayName: 'Build tar.gz with python 3.7'
-    - bash: |
-        pip install pyinstaller
-        pyinstaller nrfutil.spec
-      displayName: 'Build exe with python 3.7'
-    - bash: |
-        cp -R dist/*.tar.gz "$(Build.ArtifactStagingDirectory)"
-        cp -R dist/*.exe "$(Build.ArtifactStagingDirectory)"
-      condition: eq(variables['python_arch'], 'x64')
-      displayName: 'Copy artifacts'
-    - task: GitHubRelease@0
-      inputs:
-        gitHubConnection: 'waylandCI'
-        repositoryName: 'NordicSemiconductor/pc-nrfutil'
-        action: 'edit'
-        tagSource: 'Git tag'
-        tag: '$(Build.SourceBranchName)'
-        assetUploadMode: 'replace'
-        isDraft: 'true'
-        addChangeLog: 'false'
-      condition: ne(variables['Build.Reason'], 'PullRequest')
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: "$(python_version)"
+          architecture: "$(python_arch)"
+      - bash: |
+          pip install -r requirements-frozen.txt
+          python setup.py sdist
+        displayName: "Build tar.gz with python $(python_version)"
+      - bash: |
+          pip install https://github.com/pyinstaller/pyinstaller/archive/develop.tar.gz
+          pyinstaller nrfutil.spec
+        displayName: "Build exe with python $(python_version)"
+      - bash: |
+          cp -R dist/*.tar.gz "$(Build.ArtifactStagingDirectory)"
+          cp -R dist/*.exe "$(Build.ArtifactStagingDirectory)"
+        condition: and(eq(variables['python_arch'], 'x64'), eq(variables['python_version'], '3.7'))
+        displayName: "Copy artifacts"
+      - task: GitHubRelease@0
+        inputs:
+          gitHubConnection: "waylandCI"
+          repositoryName: "NordicSemiconductor/pc-nrfutil"
+          action: "edit"
+          tagSource: "Git tag"
+          tag: "$(Build.SourceBranchName)"
+          assetUploadMode: "replace"
+          isDraft: "true"
+          addChangeLog: "false"
+        condition: ne(variables['Build.Reason'], 'PullRequest')

nordicsemi/__main__.py

@@ -59,9 +59,6 @@
 from nordicsemi.lister.device_lister import DeviceLister
 import spinel.util as util
 
-# Python 2 compatibility provided by package future
-from builtins import input
-
 logger = logging.getLogger(__name__)
 
 def ble_driver_init(conn_ic_id):
@@ -197,7 +194,7 @@ def convert(self, value, param, ctx):
 class OptionRequiredIf(click.Option):
 
     def full_process_value(self, ctx, value):
-        value = super(OptionRequiredIf, self).full_process_value(ctx, value)
+        value = super().full_process_value(ctx, value)
         if ('serial_number' not in ctx.params or not ctx.params['serial_number']) and value is None:
             msg = 'Required if "-snr" / "--serial-number" is not defined.'
             raise click.MissingParameter(ctx=ctx, param=self, message=msg)

nordicsemi/bluetooth/hci/codec.py

@@ -38,7 +38,7 @@
 UART_HEADER_OCTET_COUNT = 4
 
 
-class ThreeWireUartPacket(object):
+class ThreeWireUartPacket:
     """
     This class encapsulate a three wire uart packet according to Bluetooth specification
     version 4.0 [Vol 4] part D.

nordicsemi/dfu/bl_dfu_sett.py

@@ -53,7 +53,7 @@
 
 logger = logging.getLogger(__name__)
 
-class BLDFUSettingsStructV1(object):
+class BLDFUSettingsStructV1:
 
     def __init__(self, settings_address):
         self.bytes_count = 92
@@ -72,7 +72,7 @@ def __init__(self, settings_address):
         self.last_addr         = settings_address + 0x5C
 
 
-class BLDFUSettingsStructV2(object):
+class BLDFUSettingsStructV2:
 
     def __init__(self, settings_address):
         self.bytes_count = 803 # Entire settings page
@@ -97,7 +97,7 @@ def __init__(self, settings_address):
         self.last_addr            = settings_address + 0x322
 
 
-class BLDFUSettings(object):
+class BLDFUSettings:
     """ Class to abstract a bootloader and its settings """
 
     flash_page_51_sz      = 0x400

nordicsemi/dfu/dfu.py

@@ -49,7 +49,7 @@
 logger = logging.getLogger(__name__)
 
 
-class Dfu(object):
+class Dfu:
     """ Class to handle upload of a new hex image to the device. """
 
     def __init__(self, zip_file_path, dfu_transport, connect_delay):

nordicsemi/dfu/dfu_transport_ant.py

@@ -90,7 +90,7 @@ class ValidationException(NordicSemiException):
 logger = logging.getLogger(__name__)
 
 
-class AntParams(object):
+class AntParams:
     # 2466 MHz
     DEF_RF_FREQ = 66
     # 16 Hz
@@ -110,7 +110,7 @@ def __init__(self):
         self.network_key = self.DEF_NETWORK_KEY
 
 
-class DfuAdapter(object):
+class DfuAdapter:
     ANT_RSP_TIMEOUT = 100
     ANT_DFU_CHAN = 0
     ANT_NET_KEY_IDX = 0
@@ -326,7 +326,7 @@ def __init__(self,
                  prn=DEFAULT_PRN,
                  debug=DEFAULT_DO_DEBUG):
 
-        super(DfuTransportAnt, self).__init__()
+        super().__init__()
         if ant_config is None:
             ant_config = AntParams()
         self.ant_config     = ant_config
@@ -341,7 +341,7 @@ def __init__(self,
 
 
     def open(self):
-        super(DfuTransportAnt, self).open()
+        super().open()
         ant_dev = None
         try:
             ant_dev = antlib.ANTDevice(self.port, 57600,
@@ -368,7 +368,7 @@ def open(self):
         self.__get_mtu()
 
     def close(self):
-        super(DfuTransportAnt, self).close()
+        super().close()
         self.dfu_adapter.close()
 
     def send_init_packet(self, init_packet):

nordicsemi/dfu/dfu_transport_ble.py

@@ -84,7 +84,7 @@ class DFUAdapter(BLEDriverObserver, BLEAdapterObserver):
     LOCAL_ATT_MTU         = 247
 
     def __init__(self, adapter, bonded=False, keyset=None):
-        super(DFUAdapter, self).__init__()
+        super().__init__()
 
         self.evt_sync           = EvtSync(['connected', 'disconnected', 'sec_params',
                                            'auth_status', 'conn_sec_update'])
@@ -410,14 +410,14 @@ def on_gattc_evt_exchange_mtu_rsp(self, ble_driver, conn_handle, *, status, att_
 
 class DfuBLEDriver(BLEDriver):
     def __init__(self, serial_port, baud_rate=115200, auto_flash=False):
-        super(DfuBLEDriver, self).__init__(serial_port, baud_rate)
+        super().__init__(serial_port, baud_rate)
 
     @NordicSemiErrorCheck
     @wrapt.synchronized(BLEDriver.api_lock)
     def ble_gap_sec_params_reply(self, conn_handle, sec_status, sec_params, own_keys, peer_keys):
         assert isinstance(sec_status, BLEGapSecStatus), 'Invalid argument type'
-        assert isinstance(sec_params, (BLEGapSecParams, NoneType)), 'Invalid argument type'
-        assert isinstance(peer_keys, NoneType), 'NOT IMPLEMENTED'
+        assert sec_params is None or isinstance(sec_params, BLEGapSecParams), 'Invalid argument type'
+        assert peer_keys is None, 'NOT IMPLEMENTED'
 
         return driver.sd_ble_gap_sec_params_reply(self.rpc_adapter,
                                                   conn_handle,
@@ -438,7 +438,7 @@ def __init__(self,
                  target_device_addr=None,
                  baud_rate=1000000,
                  prn=0):
-        super(DfuTransportBle, self).__init__()
+        super().__init__()
         DFUAdapter.LOCAL_ATT_MTU = att_mtu
         self.baud_rate          = baud_rate
         self.serial_port        = serial_port
@@ -455,7 +455,7 @@ def open(self):
         if self.dfu_adapter:
             raise IllegalStateException('DFU Adapter is already open')
 
-        super(DfuTransportBle, self).open()
+        super().open()
         driver           = DfuBLEDriver(serial_port = self.serial_port,
                                         baud_rate   = self.baud_rate)
         adapter          = BLEAdapter(driver)
@@ -474,7 +474,7 @@ def close(self):
 
         if not self.dfu_adapter:
             raise IllegalStateException('DFU Adapter is already closed')
-        super(DfuTransportBle, self).close()
+        super().close()
         self.dfu_adapter.close()
         self.dfu_adapter = None
 

nordicsemi/dfu/dfu_transport_serial.py

@@ -61,7 +61,7 @@ class ValidationException(NordicSemiException):
 
 logger = logging.getLogger(__name__)
 
-class Slip(object):
+class Slip:
     SLIP_BYTE_END             = 0o300
     SLIP_BYTE_ESC             = 0o333
     SLIP_BYTE_ESC_END         = 0o334
@@ -112,7 +112,7 @@ def decode_add_byte(c, decoded_data, current_state):
 
         return (finished, current_state, decoded_data)
 
-class DFUAdapter(object):
+class DFUAdapter:
     def __init__(self, serial_port):
         self.serial_port = serial_port
 
@@ -175,7 +175,7 @@ def __init__(self,
                  prn=DEFAULT_PRN,
                  do_ping=DEFAULT_DO_PING):
 
-        super(DfuTransportSerial, self).__init__()
+        super().__init__()
         self.com_port = com_port
         self.baud_rate = baud_rate
         self.flow_control = 1 if flow_control else 0
@@ -192,7 +192,7 @@ def __init__(self,
 
 
     def open(self):
-        super(DfuTransportSerial, self).open()
+        super().open()
         try:
             self.__ensure_bootloader()
             self.serial_port = Serial(port=self.com_port,
@@ -217,7 +217,7 @@ def open(self):
         self.__get_mtu()
 
     def close(self):
-        super(DfuTransportSerial, self).close()
+        super().close()
         self.serial_port.close()
 
     def send_init_packet(self, init_packet):

nordicsemi/dfu/dfu_trigger.py

@@ -64,7 +64,7 @@
 
 logger = logging.getLogger(__name__)
 
-is_32_bit = ctypes.sizeof(ctypes.c_voidp) == 4
+is_32_bit = ctypes.sizeof(ctypes.c_void_p) == 4
 abs_file_dir = os.path.dirname(os.path.abspath(__file__))
 rel_import_dir = ""