fix: correct the platform and arch for win32 and macos (#3036)

CHANGELOG.md

@@ -10,6 +10,7 @@
 
 - Support reading requirement constraints from pip-style requirement files for "overriding" via `--override` option. ([#2896](https://github.com/pdm-project/pdm/issues/2896))
 - Add a `--non-interactive` option for automation scenarios, also interactive prompts will not show up when not running in an interactive terminal. ([#2934](https://github.com/pdm-project/pdm/issues/2934))
+- Refactored `pdm python install --list` to reuse the same implementation as other cli commands that work with Python interpreters from pbs_installer. ([#2977](https://github.com/pdm-project/pdm/issues/2977))
 - Add `--license` and `--project-version` as CLI options to control and streamline them during `pdm init` - especially in automated scenarios with `--non-interactive` ([#2978](https://github.com/pdm-project/pdm/issues/2978))
 - Run pdm sync in "post-rewrite" stage of pre-commit ([#2994](https://github.com/pdm-project/pdm/issues/2994))
 - `Project.get_dependencies()` now returns a list of `Requirement` instead of a mapping.

news/3035.bugfix.md

@@ -0,0 +1 @@
+Correct the current platform and architecture for win32 and macos systems.

pyproject.toml

@@ -21,7 +21,7 @@ dependencies = [
     "virtualenv>=20",
     "pyproject-hooks",
     "unearth>=0.16.0",
-    "dep-logic>=0.4.2",
+    "dep-logic>=0.4.3",
     "findpython>=0.6.0,<1.0.0a0",
     "tomlkit>=0.11.1,<1",
     "shellingham>=1.3.2",

src/pdm/models/in_process/env_spec.py

@@ -13,6 +13,8 @@ def get_arch() -> str:
     if arch in ("i386", "i686"):
         return "x86"
     if arch == "amd64":
+        if platform.architecture()[0] == "32bit":
+            return "x86"
         return "x86_64"
     if arch == "arm64":
         return "aarch64"
@@ -42,7 +44,10 @@ def get_platform() -> str:
         mac_ver = platform.mac_ver()[0].split(".")
         if arch == "aarch64":
             arch = "arm64"
-        return f"macos_{mac_ver[0]}_{mac_ver[1]}_{arch}"
+        major, minor = int(mac_ver[0]), int(mac_ver[1])
+        if major >= 11:
+            minor = 0
+        return f"macos_{major}_{minor}_{arch}"
     else:
         raise EnvError("Unsupported platform")