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

add test workflow #11

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
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
41 changes: 41 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: test

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
test-w-conda-recipe:
strategy:
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
submodules: true
- uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true
auto-activate-base: true
activate-environment: ""
channel-priority: strict
miniforge-variant: Mambaforge
use-mamba: true
- name: install common dependencies
run: mamba install -n base -c conda-forge conda-build boa -y
- name: linux conda build
if: matrix.os == 'ubuntu-latest'
shell: bash -l {0}
run: conda mambabuild -c conda-forge conda-recipe
- name: osx conda build
if: matrix.os == 'macos-latest'
shell: bash -l {0}
run: conda mambabuild -c conda-forge conda-recipe
- name: windows conda build
if: matrix.os == 'windows-latest'
shell: cmd /C CALL {0}
run: conda mambabuild -c conda-forge conda-recipe
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "ext/pybind11"]
path = ext/pybind11
url = https://github.com/pybind/pybind11
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ include_directories(include)
FIND_PACKAGE(VIGRA REQUIRED)
include_directories(${VIGRA_INCLUDE_DIR})

find_package(pybind11 REQUIRED)
include_directories(${pybind11_INCLUDE_DIRS})

FIND_PACKAGE(Threads REQUIRED) # includes pthread

#--------------------------------------------------------
Expand All @@ -54,5 +57,4 @@ endif(WITH_OPENMP)
#--------------------------------------------------------
# source directory
#--------------------------------------------------------
add_subdirectory(ext/pybind11)
add_subdirectory(src)
11 changes: 10 additions & 1 deletion conda-recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
c_compiler:
- vs2019 # [win]

cxx_compiler:
- vs2019 # [win]

pybind11_abi:
- 4

boost:
- 1.74
vigra:
- 1.11.1
python:
- 3.7
- 3.7 # [not (osx and arm64)]
- 3.8
- 3.9
- 3.10
1 change: 1 addition & 0 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ requirements:
host:
- boost {{ boost }}
- python
- pybind11
- vigra {{ vigra }}

run:
Expand Down
1 change: 0 additions & 1 deletion ext/pybind11
Submodule pybind11 deleted from 0a0758
2 changes: 1 addition & 1 deletion src/python/ilastiktools/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
find_package( PythonInterp REQUIRED )
# find_package( PythonInterp REQUIRED )
pybind11_add_module(_core core.cxx)

execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
Expand Down