pyhw 0.8.0__tar.gz → 0.10.0__tar.gz

{pyhw-0.8.0/src/pyhw.egg-info → pyhw-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.8.0
+Version: 0.10.0
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author-email: Xiao Ran <xiaoran.007@icloud.com>
 License: BSD-3-Clause
@@ -10,10 +10,10 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.1.2
+Requires-Dist: pypci-ng>=0.1.3
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)
@@ -27,6 +27,7 @@ Requires-Dist: pypci-ng>=0.1.2
 
 ![Static Badge](https://img.shields.io/badge/amd64-green)
 ![Static Badge](https://img.shields.io/badge/arm-blue)
+![Static Badge](https://img.shields.io/badge/riscv64-%238A2BE2)
 
 
 PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python. **Currently, this project is still in the initial stage, only Linux, macOS, FreeBSD and Windows are supported.**
@@ -41,8 +42,23 @@ This project is a Python reimplementation of [neofetch](https://github.com/dylan
 
 
 
-## Install
-There are already a lot of similar tools so you can choose any of them; they're all essentially no different. If you want to try this tool, just install it directly by pip.
+## 1. Install
+There are already a lot of similar tools so you can choose any of them; they're all essentially no different. If you want to try this tool, There are two convenient ways to install it.
+
+### 1.1 Install by pipx
+**pipx** is an amazing tool to help you install and run applications written in Python. It is more like **brew** or **apt**. You can find more information about it here [pipx](https://github.com/pypa/pipx). **pipx** is available on almost all major platforms and is usually provided by the corresponding package manager. If you haven't used pipx before, you can refer to this [document](https://pipx.pypa.io/stable/installation/) to install it.
+
+You can install pyhw by the following command:
+```shell
+pipx install pyhw
+```
+You can then use this tool directly from the command line with the following command, just like neofetch.
+```shell
+pyhw
+```
+
+### 1.2 Install by pip
+In any case, pip is always available, so if you can't install this program using **pipx**, you can install pyhw by the following command:
 ```shell
 pip install pyhw
 ```
@@ -60,19 +76,8 @@ python -m pyhw
 ```
 Please note that the command line entry for __pyhw__ is created by pip, and depending on the user, this entry may not in the __system PATH__. If you encounter this problem, pip will give you a prompt, follow the prompts to add entry to the __system PATH__.
 
-### Install by pipx
-**pipx** is an amazing tool to help you install and run applications written in Python. It is more like **brew** or **apt**. You can find more information about it here [pipx](https://github.com/pypa/pipx).
-
-You can install pyhw by the following command:
-```shell
-pipx install pyhw
-```
-You can then use this tool directly from the command line with the following command, just like neofetch.
-```shell
-pyhw
-```
 
-### Important note about debian 12:
+### 1.3 Important note about debian 12:
 If you use system pip to install pyhw, you will encounter this problem on debian12 and some related distributions (like Ubuntu 24.04):
 ```text
 error: externally-managed-environment
@@ -92,32 +97,34 @@ error: externally-managed-environment
 note: If you believe this is a mistake, please contact your Python installation or OS distribution provider. You can override this, at the risk of breaking your Python installation or OS, by passing --break-system-packages.
 hint: See PEP 668 for the detailed specification.
 ```
-This is due to the fact that system python is not supposed to be managed by pip. You can simply use **pipx** to install **pyhw**. Or you can use a virtual environment (venv) or force remove this restriction (not recommended).
+This is due to the fact that system python is not supposed to be managed by pip. You can simply use **pipx** to install **pyhw**. Or you can use a virtual environment (venv), conda environment or force remove this restriction (not recommended).
 
-## Tested OS
+## 2. Tested OS
 * macOS arm64, x86_64
-* Linux arm64, x86_64
+* Linux arm64, x86_64, riscv64
 * FreeBSD arm64
-* Windows 10 X86_64
+* Windows 10 x86_64
+* Windows 11 arm64, x86_64
+
+For more detailed information, please refer to [Tested Platform](docs/tested_platform.md).
 
-## Add Logo
+## 3. Add Logo
 1. Create a file named **\<os>.pyhw** in **logo/ascii** folder
 2. Modify **colorConfig.py** file to add a new logo style
 3. Update **pyhwUtil.py** to enable new logo style.
 
-## Build from source
-Currently, build process relay on swiftc and macOS IOKit framework. To build package from source, you need a Mac machine with macOS 11 and newer.
+## 4. Build from source
 
-### Dependencies
+### 4.1 Dependencies
 This package was originally implemented in pure python and only depends on the python standard library. However, in subsequent development, the code for the pci part was separated into a separate package **pypci-ng**, which can be obtained using pip (or check out [this](https://github.com/xiaoran007/pypci) GitHub repository).
 
-### Build tools
+### 4.2 Build tools
 Make sure the following Python build tools are already installed.
 * setuptools
 * build
 * twine
 
-### Build package
+### 4.3 Build package
 clone the project, and run:
 ```shell
 python -m build
@@ -126,11 +133,17 @@ After the build process, the source package and the binary whl package can be fo
 ```shell
 pip install dist/*.whl --force-reinstall
 ```
-Or simply type:
+
+### 4.4 Build Full Feature package
+Currently, build process relay on swiftc and macOS IOKit framework. To build Full Feature Package from source, you need a Mac machine with macOS 11 and newer.
+
+Simply type:
 ```shell
 make build
 make install
 ```
+
+## 5. Test Package
 If you have docker installed, you can test this package through docker by type:
 ```shell
 make test # local build

{pyhw-0.8.0 → pyhw-0.10.0}/README.md

@@ -10,6 +10,7 @@
 
 ![Static Badge](https://img.shields.io/badge/amd64-green)
 ![Static Badge](https://img.shields.io/badge/arm-blue)
+![Static Badge](https://img.shields.io/badge/riscv64-%238A2BE2)
 
 
 PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python. **Currently, this project is still in the initial stage, only Linux, macOS, FreeBSD and Windows are supported.**
@@ -24,8 +25,23 @@ This project is a Python reimplementation of [neofetch](https://github.com/dylan
 
 
 
-## Install
-There are already a lot of similar tools so you can choose any of them; they're all essentially no different. If you want to try this tool, just install it directly by pip.
+## 1. Install
+There are already a lot of similar tools so you can choose any of them; they're all essentially no different. If you want to try this tool, There are two convenient ways to install it.
+
+### 1.1 Install by pipx
+**pipx** is an amazing tool to help you install and run applications written in Python. It is more like **brew** or **apt**. You can find more information about it here [pipx](https://github.com/pypa/pipx). **pipx** is available on almost all major platforms and is usually provided by the corresponding package manager. If you haven't used pipx before, you can refer to this [document](https://pipx.pypa.io/stable/installation/) to install it.
+
+You can install pyhw by the following command:
+```shell
+pipx install pyhw
+```
+You can then use this tool directly from the command line with the following command, just like neofetch.
+```shell
+pyhw
+```
+
+### 1.2 Install by pip
+In any case, pip is always available, so if you can't install this program using **pipx**, you can install pyhw by the following command:
 ```shell
 pip install pyhw
 ```
@@ -43,19 +59,8 @@ python -m pyhw
 ```
 Please note that the command line entry for __pyhw__ is created by pip, and depending on the user, this entry may not in the __system PATH__. If you encounter this problem, pip will give you a prompt, follow the prompts to add entry to the __system PATH__.
 
-### Install by pipx
-**pipx** is an amazing tool to help you install and run applications written in Python. It is more like **brew** or **apt**. You can find more information about it here [pipx](https://github.com/pypa/pipx).
-
-You can install pyhw by the following command:
-```shell
-pipx install pyhw
-```
-You can then use this tool directly from the command line with the following command, just like neofetch.
-```shell
-pyhw
-```
 
-### Important note about debian 12:
+### 1.3 Important note about debian 12:
 If you use system pip to install pyhw, you will encounter this problem on debian12 and some related distributions (like Ubuntu 24.04):
 ```text
 error: externally-managed-environment
@@ -75,32 +80,34 @@ error: externally-managed-environment
 note: If you believe this is a mistake, please contact your Python installation or OS distribution provider. You can override this, at the risk of breaking your Python installation or OS, by passing --break-system-packages.
 hint: See PEP 668 for the detailed specification.
 ```
-This is due to the fact that system python is not supposed to be managed by pip. You can simply use **pipx** to install **pyhw**. Or you can use a virtual environment (venv) or force remove this restriction (not recommended).
+This is due to the fact that system python is not supposed to be managed by pip. You can simply use **pipx** to install **pyhw**. Or you can use a virtual environment (venv), conda environment or force remove this restriction (not recommended).
 
-## Tested OS
+## 2. Tested OS
 * macOS arm64, x86_64
-* Linux arm64, x86_64
+* Linux arm64, x86_64, riscv64
 * FreeBSD arm64
-* Windows 10 X86_64
+* Windows 10 x86_64
+* Windows 11 arm64, x86_64
+
+For more detailed information, please refer to [Tested Platform](docs/tested_platform.md).
 
-## Add Logo
+## 3. Add Logo
 1. Create a file named **\<os>.pyhw** in **logo/ascii** folder
 2. Modify **colorConfig.py** file to add a new logo style
 3. Update **pyhwUtil.py** to enable new logo style.
 
-## Build from source
-Currently, build process relay on swiftc and macOS IOKit framework. To build package from source, you need a Mac machine with macOS 11 and newer.
+## 4. Build from source
 
-### Dependencies
+### 4.1 Dependencies
 This package was originally implemented in pure python and only depends on the python standard library. However, in subsequent development, the code for the pci part was separated into a separate package **pypci-ng**, which can be obtained using pip (or check out [this](https://github.com/xiaoran007/pypci) GitHub repository).
 
-### Build tools
+### 4.2 Build tools
 Make sure the following Python build tools are already installed.
 * setuptools
 * build
 * twine
 
-### Build package
+### 4.3 Build package
 clone the project, and run:
 ```shell
 python -m build
@@ -109,11 +116,17 @@ After the build process, the source package and the binary whl package can be fo
 ```shell
 pip install dist/*.whl --force-reinstall
 ```
-Or simply type:
+
+### 4.4 Build Full Feature package
+Currently, build process relay on swiftc and macOS IOKit framework. To build Full Feature Package from source, you need a Mac machine with macOS 11 and newer.
+
+Simply type:
 ```shell
 make build
 make install
 ```
+
+## 5. Test Package
 If you have docker installed, you can test this package through docker by type:
 ```shell
 make test # local build

{pyhw-0.8.0 → pyhw-0.10.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.8.0"
+version = "0.10.0"
 description = "PyHw, a neofetch-like command line tool for fetching system information but written mostly in python."
 keywords = ["neofetch", "system information", "command line tool", "python", "hardware information", "fastfetch", "fetching"]
 authors = [
@@ -12,9 +12,9 @@ authors = [
 ]
 readme = "README.md"
 license = {text = "BSD-3-Clause"}
-requires-python = ">=3.9"
+requires-python = ">=3.8"
 dependencies = [
-    "pypci-ng>=0.1.2"
+    "pypci-ng>=0.1.3"
 ]
 classifiers = [
     "Development Status :: 4 - Beta",

pyhw-0.10.0/src/pyhw/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.10.0'

pyhw-0.10.0/src/pyhw/__main__.py

@@ -0,0 +1,135 @@
+from .frontend import Printer
+from .backend import Data
+from .backend.title import TitleDetect
+from .backend.host import HostDetect
+from .backend.kernel import KernelDetect
+from .backend.shell import ShellDetect
+from .backend.uptime import UptimeDetect
+from .backend.os import OSDetect
+from .backend.cpu import CPUDetect
+from .backend.gpu import GPUDetect
+from .backend.memory import MemoryDetect
+from .backend.nic import NICDetect
+from .backend.npu import NPUDetect
+from .pyhwUtil import createDataString
+from .pyhwUtil import getOS, selectOSLogo
+import multiprocessing
+
+
+def detect_title(os, result_dict):
+    result_dict["title"] = TitleDetect(os=os).getTitle().title
+
+
+def detect_host(os, result_dict):
+    result_dict["Host"] = HostDetect(os=os).getHostInfo().model
+
+
+def detect_kernel(os, result_dict):
+    result_dict["Kernel"] = KernelDetect(os=os).getKernelInfo().kernel
+
+
+def detect_shell(os, result_dict):
+    result_dict["Shell"] = ShellDetect(os=os).getShellInfo().info
+
+
+def detect_uptime(os, result_dict):
+    result_dict["Uptime"] = UptimeDetect(os=os).getUptime().uptime
+
+
+def detect_os(os, result_dict):
+    result_dict["OS"] = OSDetect(os=os).getOSInfo().prettyName
+
+
+def detect_cpu(os, result_dict):
+    result_dict["CPU"] = CPUDetect(os=os).getCPUInfo().cpu
+
+
+def detect_gpu(os, result_dict):
+    gpu_info = GPUDetect(os=os).getGPUInfo()
+    if gpu_info.number > 0:
+        result_dict["GPU"] = gpu_info.gpus
+
+
+def detect_memory(os, result_dict):
+    result_dict["Memory"] = MemoryDetect(os=os).getMemoryInfo().memory
+
+
+def detect_nic(os, result_dict):
+    nic_info = NICDetect(os=os).getNICInfo()
+    if nic_info.number > 0:
+        result_dict["NIC"] = nic_info.nics
+
+
+def detect_npu(os, result_dict):
+    npu_info = NPUDetect(os=os).getNPUInfo()
+    if npu_info.number > 0:
+        result_dict["NPU"] = npu_info.npus
+
+
+def main():
+    current_os = getOS()
+    if current_os not in ["linux", "macos", "freebsd", "windows"]:
+        print(f"Only Linux, macOS, FreeBSD, and Windows are supported for now. Current OS: {current_os}")
+        return
+
+    data = Data()
+
+    manager = multiprocessing.Manager()
+    result_dict = manager.dict()
+
+    processes = [
+        multiprocessing.Process(target=detect_title, args=(current_os, result_dict)),
+        multiprocessing.Process(target=detect_host, args=(current_os, result_dict)),
+        multiprocessing.Process(target=detect_kernel, args=(current_os, result_dict)),
+        multiprocessing.Process(target=detect_shell, args=(current_os, result_dict)),
+        multiprocessing.Process(target=detect_uptime, args=(current_os, result_dict)),
+        multiprocessing.Process(target=detect_os, args=(current_os, result_dict)),
+        multiprocessing.Process(target=detect_cpu, args=(current_os, result_dict)),
+        multiprocessing.Process(target=detect_gpu, args=(current_os, result_dict)),
+        multiprocessing.Process(target=detect_memory, args=(current_os, result_dict)),
+        multiprocessing.Process(target=detect_nic, args=(current_os, result_dict)),
+        multiprocessing.Process(target=detect_npu, args=(current_os, result_dict)),
+    ]
+
+    for process in processes:
+        process.start()
+
+    for process in processes:
+        process.join()
+
+    for key, value in result_dict.items():
+        setattr(data, key, value)
+
+    logo_os = selectOSLogo(OSDetect(os=current_os).getOSInfo().id)
+    Printer(logo_os=logo_os, data=createDataString(data)).cPrint()
+
+
+# def main():
+#     current_os = getOS()
+#     if current_os not in ["linux", "macos", "freebsd", "windows"]:
+#         print(f"Only Linux, macOS, FreeBSD and Windows are supported for now. Current OS: {current_os}")
+#         return
+#     data = Data()
+#     data.title = TitleDetect(os=current_os).getTitle().title
+#     data.Host = HostDetect(os=current_os).getHostInfo().model
+#     data.Kernel = KernelDetect(os=current_os).getKernelInfo().kernel
+#     data.Shell = ShellDetect(os=current_os).getShellInfo().info
+#     data.Uptime = UptimeDetect(os=current_os).getUptime().uptime
+#     data.OS = OSDetect(os=current_os).getOSInfo().prettyName
+#     data.CPU = CPUDetect(os=current_os).getCPUInfo().cpu
+#     gpu_info = GPUDetect(os=current_os).getGPUInfo()
+#     if gpu_info.number > 0:
+#         data.GPU = gpu_info.gpus
+#     data.Memory = MemoryDetect(os=current_os).getMemoryInfo().memory
+#     nic_info = NICDetect(os=current_os).getNICInfo()
+#     if nic_info.number > 0:
+#         data.NIC = nic_info.nics
+#     npu_info = NPUDetect(os=current_os).getNPUInfo()
+#     if npu_info.number > 0:
+#         data.NPU = npu_info.npus
+#
+#     Printer(logo_os=selectOSLogo(OSDetect(os=current_os).getOSInfo().id), data=createDataString(data)).cPrint()
+
+
+if __name__ == "__main__":
+    main()

{pyhw-0.8.0 → pyhw-0.10.0}/src/pyhw/backend/cpu/linux.py

@@ -73,6 +73,9 @@ class CPUDetectLinux:
                     model = compatible.split(",")[-1]
                     if model.startswith("sun"):
                         self.__cpuInfo.model = f"Allwinner {model.split('-')[-1].upper()} ({model})"
+            elif "cvitek" in compatible:
+                model = compatible.split(",")[-1]
+                self.__cpuInfo.model = f"Cvitek {model}"
         else:
             pass
 

{pyhw-0.8.0 → pyhw-0.10.0}/src/pyhw/backend/gpu/linux.py

@@ -29,7 +29,7 @@ class GPUDetectLinux:
 
     def __handleNonePciDevices(self):
         # if detector can't find any VGA/Display/3D GPUs, assume the host is a sbc device, this function is a placeholder for a more advanced method.
-        if getArch() == "aarch64" or getArch() == "arm32":
+        if getArch() in ["aarch64", "arm32", "riscv64"]:
             self.__gpuInfo.number = 1
             self.__gpuInfo.gpus.append(f"{CPUDetect(os='linux').getCPUInfo().model} [SOC Integrated]")
         else:

{pyhw-0.8.0 → pyhw-0.10.0}/src/pyhw/backend/host/linux.py

@@ -39,7 +39,7 @@ class HostDetectLinux:
                     self._hostInfo.model = self._hostInfo.name + " " + self._hostInfo.version
                 except FileNotFoundError:
                     pass
-            elif self._arch in ["aarch64", "arm32"]:
+            elif self._arch in ["aarch64", "arm32", "riscv64"]:
                 # try to find dmi folder since some arm based desktops and servers may have same structure as x86_64 machines.
                 if os.path.exists("/sys/devices/virtual/dmi/id"):
                     try:

{pyhw-0.8.0 → pyhw-0.10.0}/src/pyhw/backend/kernel/windows.py

@@ -15,7 +15,10 @@ class KernelDetectWindows:
         version = platform.version()
         machine = platform.machine()
         display = self.__get_windows_version()
-        self.__kernelInfo.kernel = f"{version} ({display}) {machine}"
+        if display != "":
+            self.__kernelInfo.kernel = f"{version} ({display}) {machine}"
+        else:
+            self.__kernelInfo.kernel = f"{version} {machine}"
         return self.__kernelInfo
 
     @staticmethod
@@ -26,4 +29,10 @@ class KernelDetectWindows:
             winreg.CloseKey(key)
             return str(display_version)
         except:
-            raise BackendException("Unable to determine Windows kernel version.")
+            try:
+                key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\Windows NT\CurrentVersion")
+                release_id, _ = winreg.QueryValueEx(key, "ReleaseId")
+                winreg.CloseKey(key)
+                return str(release_id)
+            except:
+                return ""

{pyhw-0.8.0 → pyhw-0.10.0}/src/pyhw/backend/nic/linux.py

@@ -39,6 +39,8 @@ class NICDetectLinux:
             for interface in interfaces:
                 try:
                     if_ip = subprocess.run(["bash", "-c", f"ip -4 addr show {interface} | grep inet | awk '{{print $2}}'"], capture_output=True, text=True).stdout.strip().split("/")[0]
+                    if if_ip == "":
+                        continue
                     self._nicInfo.nics.append(f"{interface} @ {if_ip}")
                     self._nicInfo.number += 1
                 except:

{pyhw-0.8.0 → pyhw-0.10.0}/src/pyhw/backend/npu/linux.py

@@ -1,5 +1,6 @@
 from .npuInfo import NPUInfo
 import pypci
+import os
 
 
 class NPUDetectLinux:
@@ -25,9 +26,24 @@ class NPUDetectLinux:
                 self._npuInfo.number += 1
 
     def _handleNonePciDevices(self):
+        if os.path.exists("/sys/firmware/devicetree/base/tpu/compatible"):
+            try:
+                with open("/sys/firmware/devicetree/base/tpu/compatible", "r") as f:
+                    compatible = f.read().strip()
+            except FileNotFoundError:
+                compatible = ""
+            if "cvitek" in compatible:
+                model = compatible.split(",")[-1]
+                self._npuInfo.npus.append(f"Cvitek {model}")
+                self._npuInfo.number = 1
+            else:
+                pass
+        else:
+            pass
         # Place Holder for unknown NPU
-        self._npuInfo.number = 1
-        self._npuInfo.npus.append("Not found")
+        if self._npuInfo.number == 0:
+            self._npuInfo.number = 1
+            self._npuInfo.npus.append("Not found")
 
     @staticmethod
     def _npuNameClean(npu_name: str):

{pyhw-0.8.0 → pyhw-0.10.0}/src/pyhw/backend/os/windows.py

@@ -14,7 +14,10 @@ class OSDetectWindows:
         edition = platform.win32_edition()
         machine = platform.machine()
         display = self.__get_windows_version()
-        self._osInfo.prettyName = f"{system} {release} {display} ({edition}) {machine}"
+        if display != "":
+            self._osInfo.prettyName = f"{system} {release} {display} ({edition}) {machine}"
+        else:
+            self._osInfo.prettyName = f"{system} {release} ({edition}) {machine}"
         if release == "10":
             self._osInfo.id = "windows_10"
         elif release == "11":
@@ -31,5 +34,10 @@ class OSDetectWindows:
             winreg.CloseKey(key)
             return str(display_version)
         except:
-            raise BackendException("Unable to determine Windows kernel version.")
-
+            try:
+                key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\Windows NT\CurrentVersion")
+                release_id, _ = winreg.QueryValueEx(key, "ReleaseId")
+                winreg.CloseKey(key)
+                return str(release_id)
+            except:
+                return ""

{pyhw-0.8.0 → pyhw-0.10.0}/src/pyhw/pyhwUtil/pyhwUtil.py

@@ -25,7 +25,7 @@ def getOS():
 def getArch():
     """
     Get the machine architecture.
-    :return: str, value in [x86_64, x86, aarch64, arm32].
+    :return: str, value in [x86_64, x86, aarch64, arm32, riscv64].
     """
     arch = platform.machine()
     if arch == "x86_64" or arch == "AMD64" or arch == "amd64":
@@ -36,6 +36,8 @@ def getArch():
         return "aarch64"
     elif arch.find("arm") != -1:
         return "arm32"
+    elif arch == "riscv64":
+        return "riscv64"
     else:
         return "unknown"
 

{pyhw-0.8.0 → pyhw-0.10.0/src/pyhw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyhw
-Version: 0.8.0
+Version: 0.10.0
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author-email: Xiao Ran <xiaoran.007@icloud.com>
 License: BSD-3-Clause
@@ -10,10 +10,10 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.1.2
+Requires-Dist: pypci-ng>=0.1.3
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)
@@ -27,6 +27,7 @@ Requires-Dist: pypci-ng>=0.1.2
 
 ![Static Badge](https://img.shields.io/badge/amd64-green)
 ![Static Badge](https://img.shields.io/badge/arm-blue)
+![Static Badge](https://img.shields.io/badge/riscv64-%238A2BE2)
 
 
 PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python. **Currently, this project is still in the initial stage, only Linux, macOS, FreeBSD and Windows are supported.**
@@ -41,8 +42,23 @@ This project is a Python reimplementation of [neofetch](https://github.com/dylan
 
 
 
-## Install
-There are already a lot of similar tools so you can choose any of them; they're all essentially no different. If you want to try this tool, just install it directly by pip.
+## 1. Install
+There are already a lot of similar tools so you can choose any of them; they're all essentially no different. If you want to try this tool, There are two convenient ways to install it.
+
+### 1.1 Install by pipx
+**pipx** is an amazing tool to help you install and run applications written in Python. It is more like **brew** or **apt**. You can find more information about it here [pipx](https://github.com/pypa/pipx). **pipx** is available on almost all major platforms and is usually provided by the corresponding package manager. If you haven't used pipx before, you can refer to this [document](https://pipx.pypa.io/stable/installation/) to install it.
+
+You can install pyhw by the following command:
+```shell
+pipx install pyhw
+```
+You can then use this tool directly from the command line with the following command, just like neofetch.
+```shell
+pyhw
+```
+
+### 1.2 Install by pip
+In any case, pip is always available, so if you can't install this program using **pipx**, you can install pyhw by the following command:
 ```shell
 pip install pyhw
 ```
@@ -60,19 +76,8 @@ python -m pyhw
 ```
 Please note that the command line entry for __pyhw__ is created by pip, and depending on the user, this entry may not in the __system PATH__. If you encounter this problem, pip will give you a prompt, follow the prompts to add entry to the __system PATH__.
 
-### Install by pipx
-**pipx** is an amazing tool to help you install and run applications written in Python. It is more like **brew** or **apt**. You can find more information about it here [pipx](https://github.com/pypa/pipx).
-
-You can install pyhw by the following command:
-```shell
-pipx install pyhw
-```
-You can then use this tool directly from the command line with the following command, just like neofetch.
-```shell
-pyhw
-```
 
-### Important note about debian 12:
+### 1.3 Important note about debian 12:
 If you use system pip to install pyhw, you will encounter this problem on debian12 and some related distributions (like Ubuntu 24.04):
 ```text
 error: externally-managed-environment
@@ -92,32 +97,34 @@ error: externally-managed-environment
 note: If you believe this is a mistake, please contact your Python installation or OS distribution provider. You can override this, at the risk of breaking your Python installation or OS, by passing --break-system-packages.
 hint: See PEP 668 for the detailed specification.
 ```
-This is due to the fact that system python is not supposed to be managed by pip. You can simply use **pipx** to install **pyhw**. Or you can use a virtual environment (venv) or force remove this restriction (not recommended).
+This is due to the fact that system python is not supposed to be managed by pip. You can simply use **pipx** to install **pyhw**. Or you can use a virtual environment (venv), conda environment or force remove this restriction (not recommended).
 
-## Tested OS
+## 2. Tested OS
 * macOS arm64, x86_64
-* Linux arm64, x86_64
+* Linux arm64, x86_64, riscv64
 * FreeBSD arm64
-* Windows 10 X86_64
+* Windows 10 x86_64
+* Windows 11 arm64, x86_64
+
+For more detailed information, please refer to [Tested Platform](docs/tested_platform.md).
 
-## Add Logo
+## 3. Add Logo
 1. Create a file named **\<os>.pyhw** in **logo/ascii** folder
 2. Modify **colorConfig.py** file to add a new logo style
 3. Update **pyhwUtil.py** to enable new logo style.
 
-## Build from source
-Currently, build process relay on swiftc and macOS IOKit framework. To build package from source, you need a Mac machine with macOS 11 and newer.
+## 4. Build from source
 
-### Dependencies
+### 4.1 Dependencies
 This package was originally implemented in pure python and only depends on the python standard library. However, in subsequent development, the code for the pci part was separated into a separate package **pypci-ng**, which can be obtained using pip (or check out [this](https://github.com/xiaoran007/pypci) GitHub repository).
 
-### Build tools
+### 4.2 Build tools
 Make sure the following Python build tools are already installed.
 * setuptools
 * build
 * twine
 
-### Build package
+### 4.3 Build package
 clone the project, and run:
 ```shell
 python -m build
@@ -126,11 +133,17 @@ After the build process, the source package and the binary whl package can be fo
 ```shell
 pip install dist/*.whl --force-reinstall
 ```
-Or simply type:
+
+### 4.4 Build Full Feature package
+Currently, build process relay on swiftc and macOS IOKit framework. To build Full Feature Package from source, you need a Mac machine with macOS 11 and newer.
+
+Simply type:
 ```shell
 make build
 make install
 ```
+
+## 5. Test Package
 If you have docker installed, you can test this package through docker by type:
 ```shell
 make test # local build

pyhw-0.10.0/src/pyhw.egg-info/requires.txt

@@ -0,0 +1 @@
+pypci-ng>=0.1.3

pyhw-0.8.0/src/pyhw/__init__.py

@@ -1 +0,0 @@
-__version__ = '0.8.0'

pyhw-0.8.0/src/pyhw/__main__.py

@@ -1,46 +0,0 @@
-from .frontend import Printer
-from .backend import Data
-from .backend.title import TitleDetect
-from .backend.host import HostDetect
-from .backend.kernel import KernelDetect
-from .backend.shell import ShellDetect
-from .backend.uptime import UptimeDetect
-from .backend.os import OSDetect
-from .backend.cpu import CPUDetect
-from .backend.gpu import GPUDetect
-from .backend.memory import MemoryDetect
-from .backend.nic import NICDetect
-from .backend.npu import NPUDetect
-from .pyhwUtil import createDataString
-from .pyhwUtil import getOS, selectOSLogo
-
-
-def main():
-    current_os = getOS()
-    if current_os not in ["linux", "macos", "freebsd", "windows"]:
-        print(f"Only Linux, macOS, FreeBSD and Windows are supported for now. Current OS: {current_os}")
-        return
-    data = Data()
-    data.title = TitleDetect(os=current_os).getTitle().title
-    data.Host = HostDetect(os=current_os).getHostInfo().model
-    data.Kernel = KernelDetect(os=current_os).getKernelInfo().kernel
-    data.Shell = ShellDetect(os=current_os).getShellInfo().info
-    data.Uptime = UptimeDetect(os=current_os).getUptime().uptime
-    data.OS = OSDetect(os=current_os).getOSInfo().prettyName
-    data.CPU = CPUDetect(os=current_os).getCPUInfo().cpu
-    gpu_info = GPUDetect(os=current_os).getGPUInfo()
-    if gpu_info.number > 0:
-        data.GPU = gpu_info.gpus
-    data.Memory = MemoryDetect(os=current_os).getMemoryInfo().memory
-    nic_info = NICDetect(os=current_os).getNICInfo()
-    if nic_info.number > 0:
-        data.NIC = nic_info.nics
-    npu_info = NPUDetect(os=current_os).getNPUInfo()
-    if npu_info.number > 0:
-        data.NPU = npu_info.npus
-
-    Printer(logo_os=selectOSLogo(OSDetect(os=current_os).getOSInfo().id), data=createDataString(data)).cPrint()
-
-
-if __name__ == "__main__":
-    main()

pyhw-0.8.0/src/pyhw.egg-info/requires.txt

@@ -1 +0,0 @@
-pypci-ng>=0.1.2