38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 8c8cf1a2a09ba8b6b02be5a69bb8cbf5ff2a4838 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Fri, 12 Jul 2019 18:54:36 +0200
|
|
Subject: [PATCH] setup.py: catch import error for cpuinfo
|
|
|
|
BUILDSTDERR: Traceback (most recent call last):
|
|
BUILDSTDERR: File "setup.py", line 112, in <module>
|
|
BUILDSTDERR: import cpuinfo
|
|
BUILDSTDERR: File "/usr/lib/python3.7/site-packages/cpuinfo/__init__.py", line 7, in <module>
|
|
BUILDSTDERR: from cpuinfo.cpuinfo import *
|
|
BUILDSTDERR: File "/usr/lib/python3.7/site-packages/cpuinfo/cpuinfo.py", line 2256, in <module>
|
|
BUILDSTDERR: _check_arch()
|
|
BUILDSTDERR: File "/usr/lib/python3.7/site-packages/cpuinfo/cpuinfo.py", line 231, in _check_arch
|
|
BUILDSTDERR: raise Exception("py-cpuinfo currently only works on X86 and some PPC and ARM CPUs.")
|
|
BUILDSTDERR: Exception: py-cpuinfo currently only works on X86 and some PPC and ARM CPUs.
|
|
---
|
|
setup.py | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 468b970588..2508a94fbe 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -109,8 +109,12 @@ if __name__ == '__main__':
|
|
with io.open('README.rst', encoding='utf-8') as f:
|
|
long_description = f.read()
|
|
|
|
- import cpuinfo
|
|
- cpu_info = cpuinfo.get_cpu_info()
|
|
+ try:
|
|
+ import cpuinfo
|
|
+ cpu_info = cpuinfo.get_cpu_info()
|
|
+ except Exception:
|
|
+ # newer cpuinfo versions fail to import on unsupported architectures
|
|
+ cpu_info = None
|
|
|
|
########### Check versions ##########
|
|
def exit_with_error(message):
|