Skip to content

Commit

Permalink
Merge pull request #37 from ilastik/upd-py38-py39
Browse files Browse the repository at this point in the history
update pins
  • Loading branch information
k-dominik authored Nov 9, 2021
2 parents 5bf9472 + b6722cd commit 1a4aa17
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 81 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
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:
- name: checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: setup conda
uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true
auto-activate-base: true
activate-environment: ""
- name: linux conda build test
if: matrix.os == 'ubuntu-latest'
shell: bash -l {0}
run: |
conda install -n base -c conda-forge conda-build -y
xvfb-run conda build -c conda-forge conda-recipe
- name: osx conda build test
if: matrix.os == 'macos-latest'
shell: bash -l {0}
run: |
conda install -n base -c conda-forge conda-build -y
conda build -c conda-forge conda-recipe
- name: windows conda build test
if: matrix.os == 'windows-latest'
shell: cmd /C CALL {0}
# auto activation of env does not seem to work on win
run: |
conda install -n base -c conda-forge conda-build -y & conda build -c conda-forge conda-recipe
51 changes: 0 additions & 51 deletions .travis.yml

This file was deleted.

3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
Marching cubes implementation for the volumina 3D viewer
========================================================

[![Build status](https://ci.appveyor.com/api/projects/status/xqo5wl6d1bgxygli/branch/master?svg=true)](https://ci.appveyor.com/project/k-dominik/marching-cubes/branch/master)
[![Build Status](https://travis-ci.org/ilastik/marching_cubes.svg?branch=master)](https://travis-ci.org/ilastik/marching_cubes)
[![test](https://github.com/ilastik/marching_cubes/actions/workflows/test.yml/badge.svg)](https://github.com/ilastik/marching_cubes/actions/workflows/test.yml)

Creates a 3D iso surface from a 3D volume.

Expand Down
27 changes: 0 additions & 27 deletions appveyor.yml

This file was deleted.

4 changes: 3 additions & 1 deletion conda-recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
boost:
- 1.70.0
- 1.74.0
python:
- 3.7
- 3.8
- 3.9

pin_run_as_build:
python:
Expand Down
1 change: 1 addition & 0 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ build:
requirements:
build:
- cmake
- make # [not win]
- {{ compiler("cxx") }}
host:
- python
Expand Down
1 change: 1 addition & 0 deletions src/marching_cubes.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <map>
#include <vector>
#include <cstddef>

typedef float Point[3];

Expand Down

0 comments on commit 1a4aa17

Please sign in to comment.