Skip to content

Commit b022479

Browse files
committed
fixing CI
1 parent a2ea6ca commit b022479

5 files changed

Lines changed: 45 additions & 3 deletions

File tree

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
language: cpp
2+
23
matrix:
34
include:
45
- os: linux
@@ -17,6 +18,9 @@ matrix:
1718
env: CONDA=2.7
1819
- os: osx
1920
env: CONDA=3.5
21+
22+
dist: trusty
23+
2024
addons:
2125
apt:
2226
sources:

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
cmake_minimum_required(VERSION 2.8.12)
22
project (python-moos)
3-
find_package(MOOS 10 REQUIRED)
43

4+
find_package(MOOS 10 REQUIRED)
55

66
add_subdirectory(pybind11)
77
pybind11_add_module(pymoos src/pyMOOS.cpp)
8-
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${MOOS_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIR})
9-
target_link_libraries(pymoos ${PYTHON_LIBRARIES} ${MOOS_LIBRARIES})
8+
include_directories(${MOOS_INCLUDE_DIRS})
9+
target_link_libraries(pymoos ${MOOS_LIBRARIES})

conda.recipe/bld.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
"%PYTHON%" setup.py install
2+
if errorlevel 1 exit 1

conda.recipe/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
unset MACOSX_DEPLOYMENT_TARGET
3+
${PYTHON} setup.py install;

conda.recipe/meta.yaml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package:
2+
name: pymoos
3+
version: {{ environ.get('GIT_DESCRIBE_TAG', 'dev') }}
4+
5+
build:
6+
number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
7+
{% if environ.get('GIT_DESCRIBE_NUMBER', '0') == '0' %}string: py{{ environ.get('PY_VER').replace('.', '') }}_0
8+
{% else %}string: py{{ environ.get('PY_VER').replace('.', '') }}_{{ environ.get('GIT_BUILD_STR', 'GIT_STUB') }}{% endif %}
9+
script_env:
10+
- CC
11+
- CXX
12+
13+
source:
14+
git_url: ../
15+
16+
requirements:
17+
build:
18+
- python
19+
- setuptools
20+
- pybind11
21+
- cmake
22+
23+
run:
24+
- python
25+
- vs2015_runtime # [win]
26+
27+
test:
28+
imports:
29+
- pymoos
30+
31+
about:
32+
summary: An example project built with pybind11.
33+
license_file: LICENSE

0 commit comments

Comments
 (0)