From a60978a4ee2b7d8ffe8ec7b571a6f378a6dbe969 Mon Sep 17 00:00:00 2001 From: "Paul m. p. Peny" Date: Wed, 3 Jul 2024 18:57:27 +0200 Subject: [PATCH 1/3] handle cython cache argument when needed git + 3.13 seems to require that --- setup.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 1e15f01c01..2a586cb1a5 100644 --- a/setup.py +++ b/setup.py @@ -252,10 +252,14 @@ def consume_arg(name): priority = 0 if outdated: print(f'Compiling {pyx_file} because the generated C file is missing.') - queue.append((priority, {'pyx_file': pyx_file, 'c_file': c_file, 'fingerprint': None, 'quiet': False, - 'options': c_options, 'full_module_name': ext.name, + try: + queue.append((priority, {'pyx_file': pyx_file, 'c_file': c_file, 'fingerprint': None, + 'quiet': False, 'options': c_options, 'full_module_name': ext.name, 'embedded_metadata': pyx_meta.get(ext.name)})) - + except: + queue.append((priority, {'pyx_file': pyx_file, 'c_file': c_file, 'fingerprint': None, + cache=None, 'quiet': False, 'options': c_options, + 'full_module_name': ext.name, 'embedded_metadata': pyx_meta.get(ext.name)})) # compile in right order queue.sort(key=lambda a: a[0]) queue = [pair[1] for pair in queue] From a7a0a0000e9b8a9ae5f4422084f4a2a66f89b53c Mon Sep 17 00:00:00 2001 From: "Paul m. p. Peny" Date: Thu, 4 Jul 2024 08:11:56 +0200 Subject: [PATCH 2/3] typo --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2a586cb1a5..3908a751e8 100644 --- a/setup.py +++ b/setup.py @@ -258,7 +258,7 @@ def consume_arg(name): 'embedded_metadata': pyx_meta.get(ext.name)})) except: queue.append((priority, {'pyx_file': pyx_file, 'c_file': c_file, 'fingerprint': None, - cache=None, 'quiet': False, 'options': c_options, + 'cache':None, 'quiet': False, 'options': c_options, 'full_module_name': ext.name, 'embedded_metadata': pyx_meta.get(ext.name)})) # compile in right order queue.sort(key=lambda a: a[0]) From 9e20edc6e6820ac767a9cd812af9a0c701eb226c Mon Sep 17 00:00:00 2001 From: "Paul m. p. Peny" Date: Thu, 4 Jul 2024 09:03:18 +0200 Subject: [PATCH 3/3] Update setup.py --- setup.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/setup.py b/setup.py index 3908a751e8..fdb5a38693 100644 --- a/setup.py +++ b/setup.py @@ -252,14 +252,10 @@ def consume_arg(name): priority = 0 if outdated: print(f'Compiling {pyx_file} because the generated C file is missing.') - try: - queue.append((priority, {'pyx_file': pyx_file, 'c_file': c_file, 'fingerprint': None, - 'quiet': False, 'options': c_options, 'full_module_name': ext.name, + queue.append((priority, {'pyx_file': pyx_file, 'c_file': c_file, 'fingerprint': None, 'quiet': False, + 'options': c_options, 'full_module_name': ext.name, 'embedded_metadata': pyx_meta.get(ext.name)})) - except: - queue.append((priority, {'pyx_file': pyx_file, 'c_file': c_file, 'fingerprint': None, - 'cache':None, 'quiet': False, 'options': c_options, - 'full_module_name': ext.name, 'embedded_metadata': pyx_meta.get(ext.name)})) + # compile in right order queue.sort(key=lambda a: a[0]) queue = [pair[1] for pair in queue] @@ -267,8 +263,11 @@ def consume_arg(name): count = len(queue) for i, kwargs in enumerate(queue): kwargs['progress'] = f'[{i + 1}/{count}] ' - cythonize_one(**kwargs) - + try: + cythonize_one(**kwargs) + except TypeError: + kwargs['cache'] = None + cythonize_one(**kwargs) if cython_only: sys.exit(0)