diff --git a/997.patch b/997.patch deleted file mode 100644 index 692633a..0000000 --- a/997.patch +++ /dev/null @@ -1,90 +0,0 @@ -From fd201d1c12f9148b267a3a46353ef8110b8385a4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Mon, 26 May 2025 12:22:59 +0200 -Subject: [PATCH] Access ast.Constant.value, not .s -- the latter is gone from - Python 3.14+ - -Followup for https://github.com/Ultimaker/Uranium/issues/498 - -Test failures this fixes: - - _____________________________ test_init_good["x"] ______________________________ - - setting_function_good = - - def test_init_good(setting_function_good): - assert setting_function_good is not None - > assert setting_function_good.isValid() - E assert False - E + where False = isValid() - E + where isValid = .isValid - - tests/Settings/TestSettingFunction.py:64: AssertionError - ---------------------------- Captured stdout setup ----------------------------- - [MainThread] UM.Settings.SettingFunction._safeCompile [80]: Exception in function ('Constant' object has no attribute 's') for setting: "x" - _______________________________ test_call[data1] _______________________________ - - data = {'code': '"x"', 'result': 'x'} - - @pytest.mark.parametrize("data", test_call_data) - def test_call(data): - value_provider = MockValueProvider() - function = SettingFunction(data["code"]) - > assert function(value_provider) == data["result"] - E assert None == 'x' - E + where None = () - - tests/Settings/TestSettingFunction.py:115: AssertionError - ----------------------------- Captured stdout call ----------------------------- - [MainThread] UM.Settings.SettingFunction._safeCompile [80]: Exception in function ('Constant' object has no attribute 's') for setting: "x" - _________________________ test_getUsedSettings[data1] __________________________ - - data = {'code': '"x"', 'variables': ['x']} - - @pytest.mark.parametrize("data", test_getUsedSettings_data) - def test_getUsedSettings(data): - function = SettingFunction(data["code"]) - answer = function.getUsedSettingKeys() - > assert len(answer) == len(data["variables"]) - E AssertionError: assert 0 == 1 - E + where 0 = len(frozenset()) - E + and 1 = len(['x']) - - tests/Settings/TestSettingFunction.py:159: AssertionError - ----------------------------- Captured stdout call ----------------------------- - [MainThread] UM.Settings.SettingFunction._safeCompile [80]: Exception in function ('Constant' object has no attribute 's') for setting: "x" - _________________________ test_getUsedSettings[data7] __________________________ - - data = {'code': "sqrt('x')", 'variables': ['x']} - - @pytest.mark.parametrize("data", test_getUsedSettings_data) - def test_getUsedSettings(data): - function = SettingFunction(data["code"]) - answer = function.getUsedSettingKeys() - > assert len(answer) == len(data["variables"]) - E AssertionError: assert 0 == 1 - E + where 0 = len(frozenset()) - E + and 1 = len(['x']) - - tests/Settings/TestSettingFunction.py:159: AssertionError - ----------------------------- Captured stdout call ----------------------------- - [MainThread] UM.Settings.SettingFunction._safeCompile [80]: Exception in function ('Constant' object has no attribute 's') for setting: sqrt('x') ---- - UM/Settings/SettingFunction.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/UM/Settings/SettingFunction.py b/UM/Settings/SettingFunction.py -index 194087a00..5f3240cb6 100644 ---- a/UM/Settings/SettingFunction.py -+++ b/UM/Settings/SettingFunction.py -@@ -274,8 +274,8 @@ def visit_Constant(self, node) -> None: - - if node.value in self._blacklist: - raise IllegalMethodError(node.value) -- if node.s.startswith("_"): -- raise IllegalMethodError(node.s) -+ if node.value.startswith("_"): -+ raise IllegalMethodError(node.value) - if node.value not in self._knownNames and node.value not in dir(builtins): # type: ignore #AST uses getattr stuff, so ignore type of node.value. - self.keys.add(node.value) # type: ignore - diff --git a/python-uranium.spec b/python-uranium.spec index 693470e..8f5b9ea 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -11,8 +11,6 @@ Patch: https://github.com/Ultimaker/Uranium/pull/885.patch#/Uranium-5.3 # Force test order to fix FTBFS with pytest 8 # From https://github.com/Ultimaker/Uranium/pull/941 Patch: Uranium-5.6.0-pytest8.patch -# Fix for Python 3.14 -Patch: https://github.com/Ultimaker/Uranium/pull/997.patch # Cmake bits taken from 4.13.1, before upstream went nuts with conan Source2: mod_bundled_packages_json.py