Merge pull request #47 from kjgm/bugfix/compile_mac_mingw

Bugfix/compile mac & mingw
MurTree · Oct 18, 2023 · dd73304 · dd73304
2 parents 7182337 + e12546c
commit dd73304
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml
@@ -55,13 +55,16 @@ jobs:
           mingw-w64-x86_64-gcc
           mingw-w64-x86_64-python-pip
           mingw-w64-x86_64-python-wheel
+          mingw-w64-x86_64-python-pandas
+          git
+          mingw-w64-x86_64-meson
 
     - uses: actions/checkout@v3
 
-    - name: Install pybind11
+    - name: Add requirements
       # This is required because --no-build-isolation disable dependences
       # installation
-      run: pip install pybind11
+      run: python -m pip install gitpython pybind11 meson-python
 
     - name: Build and install
       # --no-build-isolation is required because the vanilla setuptool does not
@@ -72,4 +75,6 @@ jobs:
       run: pip install --no-build-isolation .
 
     - name: Test
-      run: python tests/test.py
+      run: | 
+        pip install pytest
+        pytest
diff --git a/setup.py b/setup.py
@@ -31,7 +31,9 @@
                                     "murtree/code/MurTree/Data Structures/",
                                     "src/pymurtree/"],
                       # passing in the version to the compiled code
-                      define_macros=[('VERSION_INFO', __version__)]
+                      define_macros=[('VERSION_INFO', __version__)],
+                      language='c++',
+                      cxx_std=11
                       )
 ]