From 20f971013ad610d2064fad0c40211868afd13308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Ma=C5=9Blanka?= <piotr.maslanka@henrietta.com.pl> Date: Sat, 19 Dec 2020 18:46:31 +0100 Subject: [PATCH] fix the unit tests at least --- example/example3/example3/example3/__init__.py | 4 ---- example/setup.py | 1 + snakehouse/__init__.py | 2 +- snakehouse/multibuild.py | 11 +++++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example/example3/example3/example3/__init__.py b/example/example3/example3/example3/__init__.py index fa84e47..8b13789 100644 --- a/example/example3/example3/example3/__init__.py +++ b/example/example3/example3/example3/__init__.py @@ -1,5 +1 @@ -import logging -import typing as tp - -logger = logging.getLogger(__name__) diff --git a/example/setup.py b/example/setup.py index f209796..ed97887 100644 --- a/example/setup.py +++ b/example/setup.py @@ -9,6 +9,7 @@ monkey_patch_parallel_compilation() dont_snakehouse = False if 'DEBUG' in os.environ: + print('Debug is enabled!') dont_snakehouse = True diff --git a/snakehouse/__init__.py b/snakehouse/__init__.py index d507142..88d6fbf 100644 --- a/snakehouse/__init__.py +++ b/snakehouse/__init__.py @@ -2,4 +2,4 @@ from .build import build from .multibuild import Multibuild from .faster_builds import monkey_patch_parallel_compilation -__version__ = '1.3a1' +__version__ = '1.3a2' diff --git a/snakehouse/multibuild.py b/snakehouse/multibuild.py index 43b1723..50544a7 100644 --- a/snakehouse/multibuild.py +++ b/snakehouse/multibuild.py @@ -56,7 +56,8 @@ class Multibuild: as a separate extension. It is for these cases when you're testing and something segfaults. """ def __init__(self, extension_name: str, files: tp.Iterator[str], - dont_snakehouse: bool = False, **kwargs): + dont_snakehouse: bool = False, + **kwargs): # sanitize path separators so that Linux-style paths are supported on Windows files = list(files) self.dont_snakehouse = dont_snakehouse @@ -66,8 +67,10 @@ class Multibuild: self.files = list([file for file in files if not file.endswith('__bootstrap__.pyx')]) logger.warning(str(self.files)) self.pyx_files = [file for file in self.files if file.endswith('.pyx')] + self.c_files = [file for file in self.files if file.endswith('.c') or file.endswith('.cpp')] else: self.pyx_files = [] + self.c_files = [] self.do_generate = True if not self.pyx_files: @@ -204,9 +207,9 @@ class Multibuild: extensions = [] len_to_sub = len(self.bootstrap_directory) + len(os.path.pathsep) for pyx_file in self.pyx_files: - file_name = pyx_file[len_to_sub:-4].replace(os.pathsep, '.') - ext = Extension(file_name, - [pyx_file], *args, **kwargs) + file_name = pyx_file[len_to_sub:-4].replace('\\', '.').replace('/', '.') + ext = Extension(self.extension_name+'.'+file_name, + [pyx_file] + self.c_files, *args, **kwargs) extensions.append(ext) return extensions else: -- GitLab