pyhw 0.6.2__py3-none-any.whl → 0.6.4__py3-none-any.whl

pyhw/backend/host/macos.py

@@ -172,6 +172,16 @@ class HostDetectMacOS:
 
         elif hw_model.startswith("Mac"):
             version = hw_model[len("Mac"):]
+            if self.__hwModelCheck(version, "16,3"):
+                return "iMac (24-inch, 2024, Four Thunderbolt / USB 4 ports)"
+            if self.__hwModelCheck(version, "16,2"):
+                return "iMac (24-inch, 2024, Two Thunderbolt / USB 4 ports)"
+            if self.__hwModelCheck(version, "16,1") or self.__hwModelCheck(version, "16,6") or self.__hwModelCheck(version, "16,8"):
+                return "MacBook Pro (14-inch, 2024, Three Thunderbolt 4 ports)"
+            if self.__hwModelCheck(version, "16,5") or self.__hwModelCheck(version, "16,7"):
+                return "MacBook Pro (16-inch, 2024, Three Thunderbolt 4 ports)"
+            if self.__hwModelCheck(version, "16,10") or self.__hwModelCheck(version, "16,15"):
+                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 +272,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.2.dist-info → pyhw-0.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.6.2
+Version: 0.6.4
 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)
@@ -83,6 +83,10 @@ 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
@@ -98,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.2.dist-info → pyhw-0.6.4.dist-info}/RECORD

@@ -17,7 +17,7 @@ pyhw/backend/host/__init__.py,sha256=Efaj7-Oya7H8HdpZHQCLrwn-mcfPb-d6yfh4dzsE_7I
 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=KW-EJK9g1xHNrFsVxJv5GPLpc_ZevX0Zv1WjZUzRkzo,15369
 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,15 +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/lib/iokitGPULib.dylib,sha256=DcJ0GZY79gTFckLFYtZgeKn1T0NFvdO_k_ccCa7od5Y,154808
+pyhw/library/lib/iokitGPULib.dylib,sha256=18A4SyThKQvzEEOijeWb4XsgXO-iTFYGa0XtrDoBHjY,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.2.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.6.2.dist-info/METADATA,sha256=8hoIX15dNDXmCpEzBrd5d4i_7BiHopdQYYglyPo_R1U,4342
-pyhw-0.6.2.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-pyhw-0.6.2.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.6.2.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.6.2.dist-info/RECORD,,
+pyhw-0.6.4.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.6.4.dist-info/METADATA,sha256=sVm6HaUN-JkIvFZvFqCIbvzdxSp0rM0MlKKd1eCibv8,4742
+pyhw-0.6.4.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+pyhw-0.6.4.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.6.4.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.6.4.dist-info/RECORD,,