Adjusted ignores and Mac-specific build variables in the toml

MintonGroup · Aug 18, 2023 · 28ec2fd · 28ec2fd
1 parent 52ffbe4
commit 28ec2fd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ dump*
 !setup.py
 !examples/**
 !swiftest/**
+!tests/**
 *ipynb_checkpoints
 **/.DS_Store
 !version.txt

diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.cibuildwheel]
 dependency-versions = "latest"
-test-requires = "pytest"
+test-requires = ["pytest"]
 test-command = "pytest {package}/tests"
 
 [tool.cibuildwheel.linux]
@@ -20,4 +20,10 @@ before-all = [
     "yum install wget m4 doxygen -y",
     "buildscripts/build_dependencies.sh",
 ]
+
+[tool.cibuildwheel.macos]
+environment = {MACOSX_DEPLOYMENT_TARGET="10.9", LD_LIBRARY_PATH="${TMPDIR}/lib:${LD_LIBRARY_PATH}",CPPFLAGS="${CPPFLAGS} -isystem ${TMPDIR}/include",LDFLAGS="${LDFLAGS} -L${TMPDIR}/lib -fPIE -Wl,-no_compact_unwind",CPATH="${CPATH} ${TMPDIR}/include}", CFLAGS="${CFLAGS} -Wno-unused-but-set-variable -fPIC -Wno-deprecated-non-prototype", SKBUILD_CONFIGURE_OPTIONS="-DUSE_OPENMP=OFF -DUSE_SIMD=OFF -DBUILD_SHARED_LIBS=OFF",FFLAGS="${FFLAGS} -fPIC"}
+before-all = [
+    "buildscripts/build_dependencies.sh -d ${TMPDIR} -p ${TMPDIR}"
+]
 
diff --git a/setup.py b/setup.py
@@ -54,6 +54,7 @@
             'astroquery>=0.4.6',
             'tqdm>=4.65.0',
             'py>=1.11'
+            'cython>=3.0.0'
       ],
       packages=['swiftest'],
       test_suite="swiftest.tests",

diff --git a/swiftest/.gitignore b/swiftest/.gitignore
@@ -2,4 +2,3 @@
 !_bindings.pyx
 !CMakeLists.txt  
 !*.py
-!tests
diff --git a/tests/.gitignore b/tests/.gitignore
@@ -1,3 +1,3 @@
-*
 !.gitignore
 !test_*.py
+simdata/**
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,3 @@ @@
     !_bindings.pyx
     !CMakeLists.txt
     !*.py
-    !tests