Merge pull request #143 from alliander-opensource/fix/options-in-build-extension

Fix some options in the build step

Author: petersalemink95

pyproject.toml

@@ -21,9 +21,6 @@ readme = "README.md"
 license = { text = "MPL-2.0" }
 classifiers = [
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: C++",
     "Programming Language :: Cython",
@@ -101,7 +98,7 @@ manylinux-aarch64-image = "manylinux2014"
 [tool.cibuildwheel.macos]
 build = ["cp*-macosx_*"]
 archs = ["x86_64", "arm64"]
-environment = { CC="clang", CXX="clang++", MACOSX_DEPLOYMENT_TARGET="10.15" }
+environment = { CC="clang", CXX="clang++" }
 # Skip trying to test arm64 builds on Intel Macs
 test-skip = ["*-macosx_arm64", "*-macosx_universal2:arm64"]
 

setup.py

@@ -129,6 +129,8 @@ def generate_build_ext(pkg_dir: Path, pkg_name: str):
             "-fvisibility=hidden",
         ]
         lflags += ["-lpthread", "-O3"]
+        # for linux/macos add visibility to the init function
+        define_macros.append(("PyMODINIT_FUNC", 'extern "C" __attribute__((visibility ("default"))) PyObject*'))
         # # extra flag for Mac
         if platform.system() == "Darwin":
             # compiler flag to set version
@@ -145,17 +147,6 @@ def generate_build_ext(pkg_dir: Path, pkg_name: str):
     cython_src_cpp = [x.with_suffix(".cpp") for x in cython_src]
     print("Generated cpp files")
     print(cython_src_cpp)
-    # for linux add visibility to the init function
-    if not if_win:
-        for cpp_src in cython_src_cpp:
-            with open(cpp_src) as f:
-                cpp_code = f.read()
-            cpp_code_modified = cpp_code.replace(
-                "#define __Pyx_PyMODINIT_FUNC PyMODINIT_FUNC",
-                '#define __Pyx_PyMODINIT_FUNC extern "C" __attribute__((visibility ("default"))) PyObject* ',
-            )
-            with open(cpp_src, "w") as f:
-                f.write(cpp_code_modified)
 
     # list of extensions of generated cpp files from cython
     exts = [