From 35cc6c03a13ffaf35010ea123bba2b404b8b0c72 Mon Sep 17 00:00:00 2001 From: buildsystem builder Date: Wed, 5 Feb 2025 11:34:11 +0000 Subject: [PATCH 1/3] Fix known_sytem function and check in tests --- okonomiyaki/runtimes/tests/test_runtime.py | 2 +- okonomiyaki/utils/testing.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/okonomiyaki/runtimes/tests/test_runtime.py b/okonomiyaki/runtimes/tests/test_runtime.py index 6912172..3d44cb6 100644 --- a/okonomiyaki/runtimes/tests/test_runtime.py +++ b/okonomiyaki/runtimes/tests/test_runtime.py @@ -16,7 +16,7 @@ class TestPythonRuntime(unittest.TestCase): @unittest.skipIf( - not known_system, + not known_system(), 'This test should be executed only on Enthought supported platforms') def test_simple_from_running_python(self): # When diff --git a/okonomiyaki/utils/testing.py b/okonomiyaki/utils/testing.py index 346ae7c..07a891b 100644 --- a/okonomiyaki/utils/testing.py +++ b/okonomiyaki/utils/testing.py @@ -53,8 +53,8 @@ def __exit__(self, *a, **kw): patcher.__exit__(*a, **kw) -def known_system(self): - from okonomiyaki.plarforms._platform import ( +def known_system(): + from okonomiyaki.platforms._platform import ( _guess_os_kind, _guess_platform, _guess_platform_details) try: os_kind = _guess_os_kind() From 267c06aefbd8b2a277fcea718123af1c84ad0548 Mon Sep 17 00:00:00 2001 From: Ioannis Tziakos Date: Wed, 5 Feb 2025 15:47:40 +0000 Subject: [PATCH 2/3] Fix known_systems function - Pass the correct object to _guess_platform - Add Arch into the platforms namespace --- okonomiyaki/platforms/__init__.py | 4 ++-- okonomiyaki/utils/testing.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/okonomiyaki/platforms/__init__.py b/okonomiyaki/platforms/__init__.py index 2bb793d..7747073 100644 --- a/okonomiyaki/platforms/__init__.py +++ b/okonomiyaki/platforms/__init__.py @@ -2,12 +2,12 @@ from .abi import PlatformABI, default_abi from .epd_platform import EPDPlatform, applies from ._platform import Platform, OSKind, FamilyKind, NameKind -from ._arch import X86, X86_64, ARM64 +from ._arch import X86, X86_64, ARM64, Arch from .pep425 import compute_abi_tag, compute_python_tag, compute_platform_tag from .python_implementation import PythonABI, PythonImplementation __all__ = [ 'X86', 'X86_64', 'ARM64', 'EPDPlatform', 'Platform', 'PythonImplementation', - 'default_abi' + 'default_abi','Arch' ] diff --git a/okonomiyaki/utils/testing.py b/okonomiyaki/utils/testing.py index 07a891b..d0d70cb 100644 --- a/okonomiyaki/utils/testing.py +++ b/okonomiyaki/utils/testing.py @@ -54,11 +54,13 @@ def __exit__(self, *a, **kw): def known_system(): + from okonomiyaki.platforms import Arch from okonomiyaki.platforms._platform import ( _guess_os_kind, _guess_platform, _guess_platform_details) try: + arch = Arch.from_running_system() os_kind = _guess_os_kind() - _guess_platform(os_kind) + _guess_platform(arch) _guess_platform_details(os_kind) except OkonomiyakiError: return False From 88b44b6cfa32fb1980a9e4fc92c49626b4e970ff Mon Sep 17 00:00:00 2001 From: Ioannis Tziakos Date: Wed, 5 Feb 2025 15:54:18 +0000 Subject: [PATCH 3/3] cleanup known_system function --- okonomiyaki/utils/testing.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/okonomiyaki/utils/testing.py b/okonomiyaki/utils/testing.py index d0d70cb..f18b845 100644 --- a/okonomiyaki/utils/testing.py +++ b/okonomiyaki/utils/testing.py @@ -56,11 +56,10 @@ def __exit__(self, *a, **kw): def known_system(): from okonomiyaki.platforms import Arch from okonomiyaki.platforms._platform import ( - _guess_os_kind, _guess_platform, _guess_platform_details) + _guess_os_kind, _guess_platform_details) try: - arch = Arch.from_running_system() + Arch.from_running_system() os_kind = _guess_os_kind() - _guess_platform(arch) _guess_platform_details(os_kind) except OkonomiyakiError: return False