diff --git a/.travis.yml b/.travis.yml index 6bdae87..0e025e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,13 @@ matrix: - MB_PYTHON_VERSION=3.5 - NP_BUILD_DEP=numpy==1.9.3 - NP_TEST_DEP=numpy==1.9.3 + - os: osx + language: generic + env: + - MB_PYTHON_VERSION=3.6 + - NP_BUILD_DEP=numpy==1.9.3 + - NP_TEST_DEP=numpy==1.9.3 + before_install: - BUILD_DEPENDS="$NP_BUILD_DEP Cython" diff --git a/config.sh b/config.sh index 887f4f2..cfb04c1 100644 --- a/config.sh +++ b/config.sh @@ -25,6 +25,6 @@ function run_tests { fi nosetests pandas \ -A "not slow and not network and not disabled" \ - -e test_abs \ + -e test_abs -e test_order -e test_argsort -e test_numpy_argsort \ $extra_nose } diff --git a/multibuild b/multibuild index 6802dca..cd526bf 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 6802dca5d640b277aa84009b857074e3d86bd994 +Subproject commit cd526bf4505fc4a10d7d045350053ff9954892fa