Commit 570ca8b0 authored by da-woods's avatar da-woods Committed by Stefan Behnel

Fix "common_include_dir" test on OS X on Travis (GH-3893)

Also turn off the clang warning about deprecated declarations to try to reduce the size of the OSX logs.
parent 560f512c
...@@ -75,25 +75,25 @@ matrix: ...@@ -75,25 +75,25 @@ matrix:
dist: xenial # Required for Python 3.7 dist: xenial # Required for Python 3.7
sudo: required # travis-ci/travis-ci#9069 sudo: required # travis-ci/travis-ci#9069
env: BACKEND=cpp env: BACKEND=cpp
- python: 3.9-dev - python: 3.9
dist: xenial # Required for Python 3.7 dist: xenial # Required for Python 3.7
sudo: required # travis-ci/travis-ci#9069 sudo: required # travis-ci/travis-ci#9069
env: BACKEND=c env: BACKEND=c
- python: 3.9-dev - python: 3.9
dist: xenial # Required for Python 3.7 dist: xenial # Required for Python 3.7
sudo: required # travis-ci/travis-ci#9069 sudo: required # travis-ci/travis-ci#9069
env: BACKEND=cpp env: BACKEND=cpp
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode6.4
env: PY=2 env: PY=2
python: 2 python: 2.7
language: c language: c
compiler: clang compiler: clang
cache: false cache: false
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode10.3
env: PY=3 env: PY=3 MACOSX_DEPLOYMENT_TARGET=10.9
python: 3 python: 3.9
language: c language: c
compiler: clang compiler: clang
cache: false cache: false
...@@ -106,7 +106,6 @@ matrix: ...@@ -106,7 +106,6 @@ matrix:
- env: STACKLESS=true BACKEND=c PY=3 - env: STACKLESS=true BACKEND=c PY=3
python: 3.6 python: 3.6
allow_failures: allow_failures:
- python: 3.9-dev
- python: pypy - python: pypy
- python: pypy3 - python: pypy3
...@@ -136,8 +135,8 @@ before_install: ...@@ -136,8 +135,8 @@ before_install:
conda --version || exit 1 conda --version || exit 1
#conda install --quiet --yes nomkl --file=test-requirements.txt --file=test-requirements-cpython.txt #conda install --quiet --yes nomkl --file=test-requirements.txt --file=test-requirements-cpython.txt
if [ "$TRAVIS_OS_NAME" == "osx" ]; then if [ "$TRAVIS_OS_NAME" == "osx" ]; then
which clang && clang --version && export CC=clang || true which clang && clang --version && export CC="clang -Wno-deprecated-declarations" || true
which clang++ && clang++ --version && export CXX=clang++ || true which clang++ && clang++ --version && export CXX="clang++ -stdlib=libc++ -Wno-deprecated-declarations" || true
fi fi
fi fi
......
...@@ -16,13 +16,18 @@ PYTHON fake_grep.py -c '#include "common/AddTraceback_impl_.*h"' c.c ...@@ -16,13 +16,18 @@ PYTHON fake_grep.py -c '#include "common/AddTraceback_impl_.*h"' c.c
import sys import sys
from Cython.Build.Dependencies import cythonize from Cython.Build.Dependencies import cythonize
import platform
import os
from distutils.core import setup from distutils.core import setup
# os x on Travis specifically seems to crash with nthreads>0
osx_on_travis = (platform.system() == "Darwin" and os.getenv("TRAVIS"))
# Test concurrent safety if multiprocessing is available. # Test concurrent safety if multiprocessing is available.
# (In particular, TravisCI does not support spawning processes from tests.) # (In particular, TravisCI does not support spawning processes from tests.)
nthreads = 0 nthreads = 0
if not hasattr(sys, 'pypy_version_info'): if not (hasattr(sys, 'pypy_version_info') or osx_on_travis):
try: try:
import multiprocessing import multiprocessing
multiprocessing.Pool(2).close() multiprocessing.Pool(2).close()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment