pyhw 0.6.2__tar.gz → 0.6.4__tar.gz

{pyhw-0.6.2/src/pyhw.egg-info → pyhw-0.6.4}/PKG-INFO

@@ -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 → pyhw-0.6.4}/README.md

@@ -66,6 +66,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
@@ -81,3 +85,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 → pyhw-0.6.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.6.2"
+version = "0.6.4"
 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 = [
@@ -14,7 +14,7 @@ readme = "README.md"
 license = {text = "BSD-3-Clause"}
 requires-python = ">=3.9"
 dependencies = [
-    "pypci-ng>=0.0.3"
+    "pypci-ng>=0.0.8"
 ]
 classifiers = [
     "Development Status :: 4 - Beta",

{pyhw-0.6.2 → pyhw-0.6.4}/src/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 → pyhw-0.6.4/src/pyhw.egg-info}/PKG-INFO

@@ -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.4/src/pyhw.egg-info/requires.txt

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

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

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