tjh.dev
1From 189681bbfb703a7026ca7bbb3b21ef554807b144 Mon Sep 17 00:00:00 2001
2From: tali auster <taliauster@gmail.com>
3Date: Wed, 15 Nov 2023 12:15:34 -0700
4Subject: [PATCH] use distro over ld
5
6The `ld` module (linux distribution) was renamed to `distro`, presumably
7so as not to subsume binutils name.
8
9---
10 setup.py | 2 +-
11 src/e3/os/platform.py | 2 +-
12 2 files changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/setup.py b/setup.py
15index c32f46f..de1ada6 100644
16--- a/setup.py
17+++ b/setup.py
18@@ -25,7 +25,7 @@ for p in ("darwin", "linux", "linux2", "win32"):
19 platform_string = ":sys_platform=='%s'" % p
20 extras_require[platform_string] = ["psutil"]
21 if p in ("linux", "linux2"):
22- extras_require[platform_string].append("ld")
23+ extras_require[platform_string].append("distro")
24
25 # Get e3 version from the VERSION file.
26 version_file = os.path.join(os.path.dirname(__file__), "VERSION")
27diff --git a/src/e3/os/platform.py b/src/e3/os/platform.py
28index 2d4e174..a9d12d3 100644
29--- a/src/e3/os/platform.py
30+++ b/src/e3/os/platform.py
31@@ -78,7 +78,7 @@ class SystemInfo:
32
33 # Fetch linux distribution info on linux OS
34 if cls.uname.system == "Linux": # linux-only
35- import ld
36+ import distro as ld
37
38 cls.ld_info = {
39 "name": ld.name(),
40--
412.40.1
42