From 602415608714cbfc57062652e16b50f49fac6a1c Mon Sep 17 00:00:00 2001 From: kjgm Date: Wed, 18 Oct 2023 11:38:58 +0200 Subject: [PATCH 1/2] add c++11 requirement, install gitpython for mingw --- .github/workflows/pip.yml | 4 ++-- setup.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml index cf433b6..d065ee0 100644 --- a/.github/workflows/pip.yml +++ b/.github/workflows/pip.yml @@ -58,10 +58,10 @@ jobs: - 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 - name: Build and install # --no-build-isolation is required because the vanilla setuptool does not 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 ) ] From e12546c76afa3832c60b98bf3b669819e50692cf Mon Sep 17 00:00:00 2001 From: kjgm Date: Wed, 18 Oct 2023 11:55:29 +0200 Subject: [PATCH 2/2] install git mingw workflow --- .github/workflows/pip.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml index d065ee0..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: Add requirements # This is required because --no-build-isolation disable dependences # installation - run: python -m pip install gitpython 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