diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml index cf433b6..bab67e9 100644 --- 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/.gitignore b/.gitignore index b2ceca6..09888a7 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ _no_* **/__pycache__/ *pymurtree_data/ **/*.cpython* +*.pyd \ No newline at end of file diff --git a/setup.py b/setup.py index 287566d..553198e 100644 --- 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 ) ] diff --git a/src/pymurtree/exporttree.h b/src/pymurtree/exporttree.h index 0dedaf8..3946964 100644 --- a/src/pymurtree/exporttree.h +++ b/src/pymurtree/exporttree.h @@ -1,4 +1,5 @@ #include "solver_result.h" +#include class ExportTree {