Skip to content
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
8 changes: 6 additions & 2 deletions .github/workflows/build_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,15 @@ jobs:
python -m unittest
cd ..
done
- name: Build Pyodide wheel
- name: Build and test Pyodide wheel
if: matrix.os == 'ubuntu-latest'
run: |
eval "$($MAMBA_EXE shell activate cibuildwheel)"
CIBW_BUILD="cp312*" python -m cibuildwheel --output-dir wheelhouse --platform pyodide
CIBW_BUILD="cp312*" python -m cibuildwheel --output-dir dist --platform pyodide
mamba install nodejs
npm install
npm test
mv dist/*wasm*.whl wheelhouse/
- name: Upload release wheels
if: |
contains(github.event.pull_request.title, 'RELEASE') &&
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ build
dist
libMcPhase.egg-info
libmcphase.egg-info
emsdk
emsdk*
Emscripten.cmake
node_modules
package-lock.json

libmcphase/*pyd
libmcphase/libmcphase.cpython*
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
cmake_minimum_required (VERSION 3.13)
cmake_minimum_required (VERSION 3.15)
project(libMcPhase)

set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
set(CMAKE_MACOSX_RPATH TRUE)
set(CMAKE_CXX_STANDARD 11)
set(CXX_STANDARD_REQUIRED 11)
cmake_policy(SET CMP0148 OLD) # New policy gives error when cannot find shared libs

set(LIBMCPHASE_PYTHON_MODULE libmcphase)

Expand Down Expand Up @@ -45,3 +44,6 @@ add_subdirectory(src)
pybind11_add_module(${LIBMCPHASE_PYTHON_MODULE} MODULE)
target_include_directories(${LIBMCPHASE_PYTHON_MODULE} PUBLIC src/include)
add_subdirectory(src/libmcphase)

# Destination name must match name of project in pyproject.toml
install(TARGETS ${LIBMCPHASE_PYTHON_MODULE} DESTINATION libmcphase)
2 changes: 1 addition & 1 deletion libmcphase/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .libmcphase import *

from . import _version
__version__ = _version.get_versions()['version']
__version__ = _version.__version__
Loading
Loading