Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/compile mac & mingw #47

Merged
merged 4 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -72,4 +75,6 @@ jobs:
run: pip install --no-build-isolation .

- name: Test
run: python tests/test.py
run: |
pip install pytest
pytest
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,4 @@ _no_*
**/__pycache__/
*pymurtree_data/
**/*.cpython*
*.pyd
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
]

Expand Down
1 change: 1 addition & 0 deletions src/pymurtree/exporttree.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "solver_result.h"
#include <string>

class ExportTree {

Expand Down
Loading