mpflash 1.25.0.post3__py3-none-any.whl → 1.25.0.post4__py3-none-any.whl

mpflash/cli_download.py

@@ -23,15 +23,6 @@ from .download import download
     "download",
     help="Download MicroPython firmware for specific ports, boards and versions.",
 )
-@click.option(
-    "--destination",
-    "-d",
-    "fw_folder",
-    type=click.Path(file_okay=False, dir_okay=True, path_type=Path),
-    default=None,
-    show_default=False,
-    help="The folder to download the firmware to.",
-)
 @click.option(
     "--version",
     "-v",
@@ -94,9 +85,6 @@ def cli_download(**kwargs) -> int:
     params.boards = list(params.boards)
     params.serial = list(params.serial)
     params.ignore = list(params.ignore)
-    if params.fw_folder: 
-        config.firmware_folder = Path(params.fw_folder)
-    # all_boards: List[MPRemoteBoard] = []
     if params.boards:
         if not params.ports:
             # no ports specified - resolve ports from specified boards by resolving board IDs

mpflash/cli_flash.py

@@ -1,4 +1,3 @@
-from pathlib import Path
 from typing import List
 
 import rich_click as click
@@ -10,8 +9,7 @@ from mpflash.ask_input import ask_missing_params
 from mpflash.cli_download import connected_ports_boards
 from mpflash.cli_group import cli
 from mpflash.cli_list import show_mcus
-from mpflash.common import BootloaderMethod, FlashParams, Params
-from mpflash.config import config
+from mpflash.common import BootloaderMethod, FlashParams, filtered_comports
 from mpflash.errors import MPFlashError
 from mpflash.flash import flash_list
 from mpflash.flash.worklist import WorkList, full_auto_worklist, manual_worklist, single_auto_worklist
@@ -27,15 +25,6 @@ from mpflash.versions import clean_version
     "flash",
     short_help="Flash one or all connected MicroPython boards with a specific firmware and version.",
 )
-@click.option(
-    "--firmware",
-    "--ff",
-    "fw_folder",
-    type=click.Path(file_okay=False, dir_okay=True, path_type=Path),
-    default=None,
-    show_default=False,
-    help="The folder to retrieve the firmware from.",
-)
 @click.option(
     "--version",
     "-v",
@@ -164,8 +153,6 @@ def cli_flash_board(**kwargs) -> int:
             # No bard specified
             params.boards = ["?"]
 
-    if params.fw_folder: 
-        config.firmware_folder = Path(params.fw_folder)
     # Detect connected boards if not specified,
     # and ask for input if boards cannot be detected
     all_boards: List[MPRemoteBoard] = []
@@ -197,8 +184,22 @@ def cli_flash_board(**kwargs) -> int:
     params.versions = [clean_version(v) for v in params.versions]
     worklist: WorkList = []
 
+    if len(params.versions) == 1 and len(params.boards) == 1 and params.serial == ["*"]:
+        # A one or more serial port including the board / variant
+        comports = filtered_comports(
+            ignore=params.ignore,
+            include=params.ports,
+            bluetooth=params.bluetooth,
+        )
+        log.info(f"Flashing {params.boards[0]} {params.variant} {params.versions[0]} to {len(comports)} serial ports")
+        log.info(f"Target ports: {', '.join(comports)}")
+        worklist = manual_worklist(
+            comports,
+            board_id=params.boards[0],
+            version=params.versions[0],
+        )
     # if serial port == auto and there are one or more specified/detected boards
-    if params.serial == ["*"] and params.boards:
+    elif params.serial == ["*"] and params.boards:
         if not all_boards:
             log.trace("No boards detected yet, scanning for connected boards")
             _, _, all_boards = connected_ports_boards(include=params.ports, ignore=params.ignore)
@@ -215,8 +216,13 @@ def cli_flash_board(**kwargs) -> int:
         )
     elif params.versions[0] and params.boards[0] and params.serial:
         # A one or more serial port including the board / variant
+        comports = filtered_comports(
+            ignore=params.ignore,
+            include=params.ports,
+            bluetooth=params.bluetooth,
+        )
         worklist = manual_worklist(
-            params.serial[0],
+            comports,
             board_id=params.boards[0],
             version=params.versions[0],
         )

mpflash/common.py

@@ -36,7 +36,6 @@ class Params:
     boards: List[str] = field(default_factory=list)
     variant: str = ""
     versions: List[str] = field(default_factory=list)
-    fw_folder: Optional[Path] = None
     serial: List[str] = field(default_factory=list)
     ignore: List[str] = field(default_factory=list)
     bluetooth: bool = False
@@ -79,6 +78,17 @@ def filtered_comports(
     ignore: Optional[List[str]] = None,
     include: Optional[List[str]] = None,
     bluetooth: bool = False,
+) -> List[str]:
+    """
+    Get a list of filtered comports using the include and ignore lists.
+    both can be globs (e.g. COM*) or exact port names (e.g. COM1)
+    """
+    return [p.device for p in filtered_portinfos(ignore, include, bluetooth)]
+
+def filtered_portinfos(
+    ignore: Optional[List[str]] = None,
+    include: Optional[List[str]] = None,
+    bluetooth: bool = False,
 ) -> List[ListPortInfo]:  # sourcery skip: assign-if-exp
     """
     Get a list of filtered comports using the include and ignore lists.

mpflash/config.py

@@ -4,9 +4,10 @@ import os
 from importlib.metadata import version
 from pathlib import Path
 from typing import List, Optional
-
 import platformdirs
 
+from mpflash.errors import MPFlashError
+
 
 def get_version():
     name = __package__ or "mpflash"
@@ -44,7 +45,15 @@ class MPFlashConfig:
     def firmware_folder(self) -> Path:
         """The folder where firmware files are stored"""
         if not self._firmware_folder:
-            self._firmware_folder = platformdirs.user_downloads_path() / "firmware"
+            from mpflash.logger import log
+            # Check if MPFLASH_FIRMWARE environment variable is set
+            env_firmware_path = os.getenv("MPFLASH_FIRMWARE")
+            if env_firmware_path:
+                firmware_path = Path(env_firmware_path)
+                if firmware_path.exists() and firmware_path.is_dir():
+                    self._firmware_folder = firmware_path
+                else:
+                    log.warning(f"Environment variable MPFLASH_FIRMWARE points to invalid directory: {env_firmware_path}. Using default location.")
             # allow testing in CI
             if Path(os.getenv("GITHUB_ACTIONS", "")).as_posix().lower() == "true":
                 workspace = os.getenv("GITHUB_WORKSPACE")
@@ -53,6 +62,13 @@ class MPFlashConfig:
                     ws_path.mkdir(parents=True, exist_ok=True)
                     print(f"Detected GitHub Actions environment. Using workspace path: {ws_path}")
                     self._firmware_folder = ws_path
+            if not self._firmware_folder:
+                self._firmware_folder = platformdirs.user_downloads_path() / "firmware"
+            if not self._firmware_folder.exists():
+                log.info(f"Creating firmware folder at {self._firmware_folder}")
+                self._firmware_folder.mkdir(parents=True, exist_ok=True)
+            if not self._firmware_folder.is_dir():
+                raise MPFlashError(f"Firmware folder {self._firmware_folder} is not a directory.")
         return self._firmware_folder
 
     @firmware_folder.setter

mpflash/connected.py

@@ -4,7 +4,7 @@ from rich import print
 from rich.progress import BarColumn, Progress, SpinnerColumn, TextColumn, TimeElapsedColumn
 from rich.table import Column
 
-from mpflash.common import filtered_comports, find_serial_by_path
+from mpflash.common import filtered_portinfos, find_serial_by_path
 from mpflash.mpremoteboard import MPRemoteBoard
 
 
@@ -21,6 +21,7 @@ def connected_ports_boards(
             - A list of unique board names of the connected MCUs.
             - A list of MPRemoteBoard instances of the connected MCUs.
     """
+    conn_mcus = [b for b in list_mcus(include=include, ignore=ignore, bluetooth=bluetooth)]
     conn_mcus = [b for b in list_mcus(include=include, ignore=ignore, bluetooth=bluetooth) if b.connected]
     # ignore boards that have the [mpflash] ignore flag set
     conn_mcus = [item for item in conn_mcus if not (item.toml.get("mpflash", {}).get("ignore", False))]
@@ -47,7 +48,7 @@ def list_mcus(*, ignore: List[str], include: List[str], bluetooth: bool = False)
     """
     # conn_mcus = [MPRemoteBoard(sp) for sp in MPRemoteBoard.connected_boards(bluetooth) if sp not in config.ignore_ports]
 
-    comports = filtered_comports(
+    comports = filtered_portinfos(
         ignore=ignore,
         include=include,
         bluetooth=bluetooth,

mpflash/download/jid.py

@@ -48,7 +48,7 @@ def ensure_firmware_downloaded(worklist: WorkList, version: str, force: bool) ->
             newlist.append((mcu, new_firmware[0]))
         else:
             log.info(f"Found {version} firmware {board_firmwares[-1].firmware_file} for {mcu.board} on {mcu.serialport}.")
-            newlist.append((mcu, firmware))
+            newlist.append((mcu, board_firmwares[0]))
 
     worklist.clear()
     worklist.extend(newlist)

mpflash/flash/worklist.py

@@ -1,11 +1,12 @@
 """Worklist for updating boards"""
 
-from pathlib import Path
-from typing import Dict, List, Optional, Tuple
+from typing import List, Optional, Tuple
 
 from loguru import logger as log
+from serial.tools.list_ports_common import ListPortInfo
+from typing_extensions import TypeAlias
 
-from mpflash.common import filtered_comports
+from mpflash.common import filtered_portinfos
 from mpflash.db.models import Firmware
 from mpflash.downloaded import find_downloaded_firmware
 from mpflash.errors import MPFlashError
@@ -14,11 +15,12 @@ from mpflash.mpboard_id import find_known_board
 from mpflash.mpremoteboard import MPRemoteBoard
 
 # #########################################################################################################
-WorkList = List[Tuple[MPRemoteBoard, Optional[Firmware]]]
+FlashItem: TypeAlias = Tuple[MPRemoteBoard, Optional[Firmware]]
+WorkList: TypeAlias = List[FlashItem]
 # #########################################################################################################
 
 
-def auto_update(
+def auto_update_worklist(
     conn_boards: List[MPRemoteBoard],
     target_version: str,
 ) -> WorkList:
@@ -59,12 +61,26 @@ def auto_update(
 
 
 def manual_worklist(
-    serial: str,
+    serial: List[str],
     *,
     board_id: str,
     version: str,
 ) -> WorkList:
-    """Create a worklist for a single board specified manually.
+    """Create a worklist for manually specified boards."""
+    wl: WorkList = []
+    for comport in serial:
+        log.trace(f"Manual updating {comport} to {board_id} {version}")
+        wl.append(manual_board(comport, board_id=board_id, version=version))
+    return wl
+
+
+def manual_board(
+    serial: str,
+    *,
+    board_id: str,
+    version: str,
+) -> FlashItem:
+    """Create a Flash work item for a single board specified manually.
 
     Args:
         serial (str): Serial port of the board
@@ -72,7 +88,7 @@ def manual_worklist(
         version (str): Firmware version
 
     Returns:
-        WorkList: List of boards and firmware information to update
+        FlashItem: Board and firmware information to update
     """
     log.trace(f"Manual updating {serial} to {board_id} {version}")
     mcu = MPRemoteBoard(serial)
@@ -85,14 +101,14 @@ def manual_worklist(
     except (LookupError, MPFlashError) as e:
         log.error(f"Board {board_id} not found in board database")
         log.exception(e)
-        return []
+        return (mcu, None)
     mcu.board = board_id
     firmwares = find_downloaded_firmware(board_id=board_id, version=version, port=mcu.port)
     if not firmwares:
-        log.error(f"No firmware found for {mcu.port} {board_id} version {version}")
-        return []
+        log.trace(f"No firmware found for {mcu.port} {board_id} version {version}")
+        return (mcu, None)
     # use the most recent matching firmware
-    return [(mcu, firmwares[-1])]  # type: ignore
+    return (mcu, firmwares[-1])  # type: ignore
 
 
 def single_auto_worklist(
@@ -111,7 +127,7 @@ def single_auto_worklist(
     """
     log.trace(f"Auto updating {serial} to {version}")
     conn_boards = [MPRemoteBoard(serial)]
-    todo = auto_update(conn_boards, version)  # type: ignore # List / list
+    todo = auto_update_worklist(conn_boards, version)  # type: ignore # List / list
     show_mcus(conn_boards)
     return todo
 
@@ -125,7 +141,7 @@ def full_auto_worklist(
 ) -> WorkList:
     """
     Create a worklist for all connected micropython boards based on the information retrieved from the board.
-    This allows the firmware version of one or moae boards to be changed without needing to specify the port or board_id manually.
+    This allows the firmware version of one or more boards to be changed without needing to specify the port or board_id manually.
 
     Args:
         version (str): Firmware version
@@ -135,7 +151,7 @@ def full_auto_worklist(
     """
     log.trace(f"Auto updating all boards to {version}")
     if selected_boards := filter_boards(all_boards, include=include, ignore=ignore):
-        return auto_update(selected_boards, version)
+        return auto_update_worklist(selected_boards, version)
     else:
         return []
 
@@ -149,7 +165,7 @@ def filter_boards(
     try:
         comports = [
             p.device
-            for p in filtered_comports(
+            for p in filtered_portinfos(
                 ignore=ignore,
                 include=include,
                 bluetooth=False,

mpflash/mpremoteboard/__init__.py

@@ -219,7 +219,7 @@ class MPRemoteBoard:
                 log.trace(result)
                 # Ok we have the info, now parse it
                 self.toml = tomllib.loads("".join(result))
-                log.debug("board_info.toml:" + self.toml["description"])
+                log.debug(f"board_info.toml: {self.toml['description']}")
             except Exception as e:
                 log.error(f"Failed to parse board_info.toml: {e}")
         else:

{mpflash-1.25.0.post3.dist-info → mpflash-1.25.0.post4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mpflash
-Version: 1.25.0.post3
+Version: 1.25.0.post4
 Summary: Flash and download tool for MicroPython firmwares
 License: MIT
 Keywords: MicroPython,firmware,flash,download,UF2,esptool
@@ -121,7 +121,15 @@ Common options are:
  - `--serial` to specify the serial port(s) to flash, defaults to all connected boards.
  - `--board` to specify which firmware to flash to a single board
 
+## Setting the Firmware Files and Database Location
 
+You can override the default location for firmware files and the MPFlash database by setting the `MPFLASH_FIRMWARE` environment variable. For example, in a Bash shell:
+
+```bash
+export MPFLASH_FIRMWARE="/path/to/custom/firmware"
+```
+
+When this variable is set, `mpflash` will use that location to store firmware files and estabish it's database.
 
 ## Selecting or ignoring specific serial ports
 

{mpflash-1.25.0.post3.dist-info → mpflash-1.25.0.post4.dist-info}/RECORD

@@ -8,14 +8,14 @@ mpflash/bootloader/detect.py,sha256=OagP2QVWeLLWkZt2paqEF6r4_x3QDcBGNCPOWfMy9NQ,
 mpflash/bootloader/manual.py,sha256=WYC4x-dxrSwVUfgnKTlu34pCzckrWJKZnWsARDocycI,3169
 mpflash/bootloader/micropython.py,sha256=v_kZkvg0uWZDbMrT78gmiYHbD83QLdnrctvEClI8iRg,529
 mpflash/bootloader/touch1200.py,sha256=VND7_YniS9Vx6WEaAxjI72RZZ6WBOwmBTsKJkbuaAHk,1105
-mpflash/cli_download.py,sha256=sMMIVTE4P9O2GpWB9jcbOiKQX-XJ0nu2bBylRbWu0X8,3872
-mpflash/cli_flash.py,sha256=Is8UH1QZ33XuajrkVOIdjOubyvAb5CcZKONJgdmmZGk,7966
+mpflash/cli_download.py,sha256=cfM3_4It2SE1inx7XsxVhl-j_2efhmuej0d58biOdLo,3507
+mpflash/cli_flash.py,sha256=Z_8_zRMW0Z1ubUgTz0rSlnRun8j21A5xPwRhMxkrMkI,8397
 mpflash/cli_group.py,sha256=Uf_1ZmeeSIsaGLuuKn3KPPPVi8fJVbIacJYFZx_oPHc,2684
 mpflash/cli_list.py,sha256=ZuRalXXjDGo6FhgMTv54BQD_PNss7eeopeZQ_uE1J90,2632
 mpflash/cli_main.py,sha256=NMhEtMtSe7ApE-210Q4p-g7ZgewgO-4z1Q-vNKLQ47Y,1277
-mpflash/common.py,sha256=iKDoc6Ut8XbZ8fYLEI2XsoU7GuG_pFG0KGcRWXPl1wE,5922
-mpflash/config.py,sha256=bmwNSJzk27iHcI-r3C6hm6-TeOat2ymzbbv-Q-xuO2o,3048
-mpflash/connected.py,sha256=oxZdk1o-AfNPhJsSxr3KrMH_gdYfrjqc_IpT6J8Ng9k,3496
+mpflash/common.py,sha256=LVN3actI__gHorWIG5-55v6dZ1cD1GSIlevk3a8Je-Y,6278
+mpflash/config.py,sha256=55cPkGvCajlEd1_lEGsPNCX9YdJqUr9muqBejVOyVVA,4066
+mpflash/connected.py,sha256=Bx2R-nAeWC6iNG77mXDMu0n66bvTMyM4sH7ckuKnCFw,3591
 mpflash/db/__init__.py,sha256=wnIlO4nOXsPGXMbn2OCqHRsR-hUmtJsko8VdqjH3ZUE,45
 mpflash/db/core.py,sha256=hyzurZp8QMl8Q9B00Q-tOkOUp68T8XhM7tj3dm5cDHw,2283
 mpflash/db/gather_boards.py,sha256=8QS7NIt3n9ROqtgVAnoqU8YMeObLGaN2pvJL7d_kULA,3905
@@ -27,7 +27,7 @@ mpflash/db/tools.py,sha256=6SEGfshNob4yRQ4h-Cj_xcWMRY28sbA8CWauNXV_uMI,814
 mpflash/download/__init__.py,sha256=zidXvsSFCfR-BZCZ6TiB7uEucEuUqXnZhKSfTs60lzU,7930
 mpflash/download/from_web.py,sha256=PVJDaFfYLJGXlPva5fExh4Yg2H7j3idyJEcfOiVVJBs,7608
 mpflash/download/fwinfo.py,sha256=gpa92PkysT1B7mxPAFJ-b_6y03QCNgHKm-J6T_RFNMI,1852
-mpflash/download/jid.py,sha256=503HW4jIB22fsb9vYphXqqO33LTMtvPdENG81wKDgMs,2334
+mpflash/download/jid.py,sha256=V57M4K0uXXxBYOB4zOKkmXvUvEQdM_-w22LZ-iMIJSE,2344
 mpflash/downloaded.py,sha256=508sqROPf0Ymz7UxMzReXtK6mG1EcoXA-ysGdzV-VM0,4040
 mpflash/errors.py,sha256=IAidY3qkZsXy6Pm1rdmVFmGyg81ywHhse3itaPctA2w,247
 mpflash/flash/__init__.py,sha256=jif7-ifsXMabidjNdqUQyl1CwD5_USjCAZFhU5W-Aw8,2992
@@ -40,7 +40,7 @@ mpflash/flash/uf2/linux.py,sha256=uTgqyS7C7xfQ25RrTcSUkt-m2u2Ks_o7bPLzIecPoC8,43
 mpflash/flash/uf2/macos.py,sha256=JTaIpqnR_0k4oSEvzs9amhmK-PMxUJyZLnZ_wZwxa-0,1228
 mpflash/flash/uf2/uf2disk.py,sha256=4_P2l-kedM7VSliA2u706LQLxvu3xWSod1-lj-xjZis,298
 mpflash/flash/uf2/windows.py,sha256=OEeskObPtpIE4a5NzYIcBqg3FkM5MGPGEa4lGGOfntY,1338
-mpflash/flash/worklist.py,sha256=ZqbgYChXFGEVLVlGKeS9eJJDToxBYqjrfWE2NIa7Cck,5622
+mpflash/flash/worklist.py,sha256=WIiBlbluAiU7UexOu1dlXguUmkvhW0uxvvUaiUCEZ1U,6165
 mpflash/list.py,sha256=NNhKpRh3ARZMdq56GLJgJ67GeuUf9SxjTzFhQjDsi9A,4008
 mpflash/logger.py,sha256=b2pNiAEXgpUDZKnMjtgBAGgMpPwTB3u030EhJiXyLZQ,2009
 mpflash/mpboard_id/__init__.py,sha256=Z6gDDWTCSKPp2fsuaUz80zgrklBR9XDlSLF9y_evR9A,391
@@ -50,7 +50,7 @@ mpflash/mpboard_id/board_info.json,sha256=A3ZIt38KvAy2NMB5srHorSBd3Q3wOZIXufWiIs
 mpflash/mpboard_id/board_info.zip,sha256=-2bnQGRsIQuJUfz-7_-GQ8pMWJ1evhCez6yfjhXocNw,23213
 mpflash/mpboard_id/known.py,sha256=GrNe4FtzVIdi9L9xuJ1gzorzXTvdfrugX1iVc_Nblb8,3325
 mpflash/mpboard_id/resolve.py,sha256=5KCZ0Tcg3FYZ3HK_zux5EguwoSC2E03kCpW2fh4rN2A,779
-mpflash/mpremoteboard/__init__.py,sha256=MOzb7igpawgJcZyCwolAP80GRch9Anw_uzDuaCMBSFo,12092
+mpflash/mpremoteboard/__init__.py,sha256=WWzAuUo3irKs_ZfHc7PREKrsywi45aPyZXuz5MaD6go,12093
 mpflash/mpremoteboard/mpy_fw_info.py,sha256=ZDEPJN9XJnoG_oeWcLNiLJAD5bkVX2yI_j4K7msUxWM,5196
 mpflash/mpremoteboard/runner.py,sha256=auJuK7uBq_qdZOX9DgzRARyAsTyhT8c9ycP02VqhMf4,4943
 mpflash/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -62,8 +62,8 @@ mpflash/vendor/pico-universal-flash-nuke/universal_flash_nuke.uf2,sha256=QuPMppq
 mpflash/vendor/pydfu.py,sha256=KD1RHHuhvhWi-l1UB6GyggkxouDKtZgkG4ivRbIfwC4,21264
 mpflash/vendor/readme.md,sha256=BQ7Uxf8joeYMjTUuSLLBG49ob6a9MgFPIEwuc72-Mfw,415
 mpflash/versions.py,sha256=HuujLNdMKY_mQXyEqwXVHcU8nbuXeBiWP2TMA5JQhr4,4884
-mpflash-1.25.0.post3.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
-mpflash-1.25.0.post3.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
-mpflash-1.25.0.post3.dist-info/METADATA,sha256=dbSzPHFoSdH8cECZgjgi_AXOK9y-p-V0xWwCvYDx8xY,26718
-mpflash-1.25.0.post3.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-mpflash-1.25.0.post3.dist-info/RECORD,,
+mpflash-1.25.0.post4.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
+mpflash-1.25.0.post4.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
+mpflash-1.25.0.post4.dist-info/METADATA,sha256=LQe8SWMkEaDhVdnIMoqsmHvZGcXjKH6Ughvb0tIQuK0,27115
+mpflash-1.25.0.post4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mpflash-1.25.0.post4.dist-info/RECORD,,

{mpflash-1.25.0.post3.dist-info → mpflash-1.25.0.post4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.1
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any