fixing include .pyx files in build

mhostert · Aug 21, 2024 · 7de7507 · 7de7507
1 parent 26abdc1
commit 7de7507
Show file tree

Hide file tree

Showing 6 changed files with 172 additions and 161 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,6 +23,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
+          pip install cython
           pip install tox tox-gh-actions
       - name: Test generator and physics output
         run: tox

diff --git a/pyproject.toml b/pyproject.toml
@@ -3,7 +3,7 @@ requires = [
     "setuptools>=42",
     "wheel",
     "numpy",
-    "cython>=3.0a6"
+    "cython>=3.0a6",
 ]
 build-backend = "setuptools.build_meta"
 

diff --git a/setup.cfg b/setup.cfg
@@ -34,7 +34,7 @@ package_dir =
 
 packages = find:
 
-python_requires = >=3.7
+python_requires = >=3.8
 
 install_requires =
 	dill
@@ -48,6 +48,7 @@ install_requires =
 	pyhepmc>=2.7.1
 
 setup_requires =
+	cython
 	numpy
 
 [options.packages.find]
@@ -59,6 +60,7 @@ where = src
 	include/*/*.txt
 	include/*/*.py
 	include/assets/*
+    *.pyx
 
 DarkNews = py.typed
 

diff --git a/setup.py b/setup.py
@@ -29,21 +29,19 @@ def no_cythonize(extensions, **_ignore):
 
 
 extensions = [
-    Extension("DarkNews.Cfourvec", ["src/DarkNews/Cfourvec.pyx"]),
+    Extension("DarkNews.Cfourvec", ["src/DarkNews/Cfourvec.pyx"], include_dirs=[np.get_include()]),
 ]
 CYTHONIZE = cythonize is not None
-print("Cythonize env var:", CYTHONIZE)
 if CYTHONIZE:
     compiler_directives = {"language_level": 3, "embedsignature": True}
     extensions = cythonize(extensions, compiler_directives=compiler_directives)
 else:
     extensions = no_cythonize(extensions)
 
-
 setup_args = dict(
-    # ext_modules=cythonize(["src/DarkNews/Cfourvec.pyx"]),
-    ext_modules=extensions,
-    include_dirs=np.get_include(),
+    ext_modules=cythonize(["src/DarkNews/Cfourvec.pyx"]),
+    # ext_modules=extensions,
+    include_dirs=[np.get_include()],
 )