Skip to content

Commit

Permalink
BUG fix compilers (#813)
Browse files Browse the repository at this point in the history
* BUG fix compilers

* Update install_class_osx.sh

* Update .travis.yml

* Update .travis/install.sh

* Update .travis.yml
  • Loading branch information
beckermr committed Aug 3, 2020
1 parent 385fff0 commit 4c2c0c8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 16 deletions.
13 changes: 0 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,6 @@ matrix:
osx_image: xcode9.4
env: TOXENV=py36
name: OSX (Python3.6)
- os: linux
sudo: required
env: TOXENV=py27
name: linux (Python2.7)
- os: osx
osx_image: xcode9.4
env: TOXENV=py27
name: OSX (Python2.7)
allow_failures:
- name: linux (Python2.7)
- name: OSX (Python2.7)
fast_finish: true
cache:
directories:
- /tmp/texlive
Expand All @@ -30,7 +18,6 @@ install:
- "./.travis/install.sh"
- export PATH=$HOME/miniconda/bin:$PATH
- source activate test-environment
- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then conda install -y llvm-openmp; fi
- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then export DYLD_FALLBACK_LIBRARY_PATH=${CONDA_PREFIX}/lib;
fi
- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then export CONDA_BUILD_SYSROOT=/; fi
Expand Down
7 changes: 5 additions & 2 deletions .travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,15 @@ py36)
conda create -q -n test-environment python=3.6 pip \
numpy nose coveralls flake8 pyyaml gsl fftw cmake swig scipy \
compilers pkg-config setuptools_scm pytest pandas pytest-cov \
cython "camb>=1" isitgr traitlets
cython "camb>=1" isitgr traitlets fast-pt
;;
esac;

# we have to activate the cond env before we install this
source activate test-environment
pip install https://github.com/JoeMcEwen/FAST-PT/archive/v3.0.2.tar.gz --no-deps
pip install mkauthlist --no-deps

if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
conda install -y -q llvm-openmp
fi
conda deactivate
2 changes: 1 addition & 1 deletion .travis/install_class_osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd class_public
git checkout v2.7.2

sed -i.bak -e 's/^CC/#CC/g' Makefile
sed -i.bak -e 's/^OPTFLAG =/OPTFLAG = -I${CONDA_PREFIX}\/include/g' Makefile
sed -i.bak -e 's/^OPTFLAG =/OPTFLAG = ${CFLAGS} ${LDFLAGS}/g' Makefile
sed -i.bak -e 's/^#CCFLAG +=/CCFLAG +=/g' Makefile
sed -i.bak -e 's/^#CCFLAG =/CCFLAG =/g' Makefile

Expand Down

0 comments on commit 4c2c0c8

Please sign in to comment.