pyhw 0.6.1__py3-none-any.whl → 0.6.3__py3-none-any.whl

pyhw/backend/gpu/macos.py

@@ -36,7 +36,7 @@ class GPUDetectMacOS:
     def __getGPUIntel(self):
         if self.__getGPUIOKit():
             pass
-        else:
+        else:  # fallback to the default implementation
             gpus = list()
             try:
                 gpu_info_dict = json.loads(subprocess.check_output(["system_profiler", "SPDisplaysDataType", "-json"]))
@@ -68,14 +68,14 @@ class GPUDetectMacOS:
                 info_list = gpu.split(", ")
                 model = info_list[0]
                 vendor_id = info_list[1]
-                vram = int(info_list[2]) / 1024
+                vram = round(int(info_list[2]) / 1024, None)
                 if self.__handleVendorID(vendor_id) == "Intel":    # Integrated GPU
                     self.__gpuInfo.gpus.append(f'{model} [CPU Integrated]')
                 elif self.__handleVendorID(vendor_id) == "AMD":    # dGPU
                     self.__gpuInfo.gpus.append(f'{model} {vram} GB [Discrete]')
             return True
         except Exception as e:
-            print(f"An error occurred while getting GPU info using IOKit: {e}")
+            # print(f"An error occurred while getting GPU info using IOKit: {e}")
             return False
 
     @staticmethod

pyhw/backend/host/macos.py

@@ -172,6 +172,8 @@ class HostDetectMacOS:
 
         elif hw_model.startswith("Mac"):
             version = hw_model[len("Mac"):]
+            if self.__hwModelCheck(version, "16,10"):
+                return "Mac mini (M4, 2024)"
             if self.__hwModelCheck(version, "15,13"):
                 return "MacBook Air (15-inch, M3, 2024)"
             if self.__hwModelCheck(version, "15,2"):
@@ -262,7 +264,7 @@ class HostDetectMacOS:
             if self.__hwModelCheck(version, "9,1"):
                 return "iMac (24/20-inch, Early 2009)"
 
-        return "Unknown Mac Model"
+        return hw_model
 
     @staticmethod
     def __hwModelCheck(version: str, target: str):

{pyhw-0.6.1.dist-info → pyhw-0.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.6.1
+Version: 0.6.3
 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
@@ -13,7 +13,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.0.3
+Requires-Dist: pypci-ng>=0.0.8
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)
@@ -82,6 +82,11 @@ This is due to the fact that system python is not supposed to be managed by pip.
 
 
 ## 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.
+
+### 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
 Make sure the following Python build tools are already installed.
 * setuptools
@@ -97,3 +102,8 @@ 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:
+```shell
+make build
+make install
+```

{pyhw-0.6.1.dist-info → pyhw-0.6.3.dist-info}/RECORD

@@ -12,12 +12,12 @@ pyhw/backend/gpu/__init__.py,sha256=EpMjPvUaXt0LTNMvGmB8WgXbUB9keCxuOhu8NT3Re6o,
 pyhw/backend/gpu/gpuBase.py,sha256=Ge0DX2P8_EB7ovM7glmPUnVsPJL3OUHV2t_1T5mimR0,409
 pyhw/backend/gpu/gpuInfo.py,sha256=d_z_z5DiZAg85wP0VOBQEU0QHdaK3qFqA2Tp9Eq8-Zs,133
 pyhw/backend/gpu/linux.py,sha256=E-evoL-spQbHB8JvbZXSq5ypc2SeePVUPnhEQrSPQpg,1619
-pyhw/backend/gpu/macos.py,sha256=063wsyXZnukdXDCpyr4HtBQO394QZGO6JxnjiQvnVjs,3793
+pyhw/backend/gpu/macos.py,sha256=SmTqqTrIMRW-GVPmDs8xAiOX7HsCjrGh9qkxLQCdvO8,3850
 pyhw/backend/host/__init__.py,sha256=Efaj7-Oya7H8HdpZHQCLrwn-mcfPb-d6yfh4dzsE_7I,58
 pyhw/backend/host/hostBase.py,sha256=POyDW3f5JSWtEKyCfrVSBEddSwoywe_OBgUExCEuje8,563
 pyhw/backend/host/hostInfo.py,sha256=Xvz0LugPiCSWMkcDsp4p2rrojYFZauL6Q-gCZ6NLz5k,184
 pyhw/backend/host/linux.py,sha256=dr82gDA4SQgyTTI3Kq5V3V6qEDH4DXoJo0wyqeXYdHk,2005
-pyhw/backend/host/macos.py,sha256=u-Orwcq0FCcr2eR9mOKUc85LGkyuiO6rZ-ggIwob92k,14593
+pyhw/backend/host/macos.py,sha256=355xfJeSsx67ZUyas114_kT_kQrl2EzLIoEhsFGRrc4,14681
 pyhw/backend/host/windows.py,sha256=rjDJaIs-5zspzFsNCMCh6m2yZXEXI0vccqeBpmAdEBk,53
 pyhw/backend/kernel/__init__.py,sha256=fGjwjpOhwA_PnsWbwoq102hwhTay2ufYKaTqxjSV2-I,65
 pyhw/backend/kernel/kernelBase.py,sha256=CMvBszl4_aP48YWnFI03I2GtngYStkcY4uDU3ub8C3E,555
@@ -77,16 +77,15 @@ pyhw/frontend/logo/ascii/macOS.pyhw,sha256=HBGROtBb7wrNtRqAQ9ND7zxK0l17BRsmpgc2d
 pyhw/frontend/logo/ascii/raspbian.pyhw,sha256=jEl6WMKF-FGx359ipQ1kzweUJS-NuauYQCFaYime4PQ,159
 pyhw/frontend/logo/ascii/ubuntu.pyhw,sha256=l-Q0PfutxXYMwTojqeiM88063x4V0RBkZUHmi6YdsNc,833
 pyhw/frontend/logo/ascii/ubuntu_small.pyhw,sha256=Xf8LSZdZUu9aEG3efhb1FUlUEuJ-3UztcIOJISpKhPw,229
-pyhw/library/iokitGPULib/te.py,sha256=UbRUT82ckEFWP_r1-52wGFhaVO9bGSsON_NTBeTawCw,294
 pyhw/library/lib/iokitGPULib.dylib,sha256=DcJ0GZY79gTFckLFYtZgeKn1T0NFvdO_k_ccCa7od5Y,154808
 pyhw/pyhwException/__init__.py,sha256=8JsFvtF13g0Y5t4z9fRndDXtfCzuBM59jDf6PhWSFSk,220
 pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1GVTFVa0,197
 pyhw/pyhwUtil/__init__.py,sha256=PzeP9fXsIhvr3sUpJ4DxW9_H25DEIasBFfXd_NztfR4,226
 pyhw/pyhwUtil/pyhwUtil.py,sha256=CKXJrt6KGhZCV1J7MjsQ21c_jPmC1I3wZBPCKJfdqbM,2478
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.6.1.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.6.1.dist-info/METADATA,sha256=NfQ7v_YPoKtQib8tsNQs568BPR_ogVIkoVGMTZU6V5A,4196
-pyhw-0.6.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-pyhw-0.6.1.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.6.1.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.6.1.dist-info/RECORD,,
+pyhw-0.6.3.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.6.3.dist-info/METADATA,sha256=vNchs4HWtGv59C2MVV2jb9IszEn3fEh7LVOtXicMNT0,4742
+pyhw-0.6.3.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+pyhw-0.6.3.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.6.3.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.6.3.dist-info/RECORD,,

{pyhw-0.6.1.dist-info → pyhw-0.6.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pyhw/library/iokitGPULib/te.py

@@ -1,12 +0,0 @@
-import ctypes
-
-# Load the dynamic library
-lib = ctypes.CDLL('./iokitGPULib.dylib')
-
-# Define the function return type as c_char_p (pointer to C char)
-lib.getGPUInfo.restype = ctypes.c_char_p
-
-# Call the function and get the result
-gpu_info = lib.getGPUInfo()
-print("Detected GPUs:", gpu_info)
-