Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build #31

Merged
merged 1 commit into from
Feb 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ branches:

## Documentation: http://docs.travis-ci.com/user/languages/julia/
language: julia
sudo: false
dist: trusty
sudo: true
dist: xenial
os:
- linux
- osx
Expand All @@ -23,19 +23,23 @@ notifications:

env:
global:
- PYTHON=conda

- PYTHON=python3
before_install:
- |
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
sudo apt-get update && sudo apt-get install -qq -y python3-pip
fi
- julia -e 'using Pkg; Pkg.add("Conda")'
- python3 -m pip install --user -U numpy scipy scikit-learn
- julia -e 'using Conda; Conda.add("scikit-learn")'
- julia -e 'using Pkg; Pkg.add("PyCall")'

before_script:
- |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew update
brew upgrade cmake
fi
- pip install --user -U numpy scipy scikit-learn
- julia -e 'using Pkg; Pkg.build("PyCall"); Pkg.update()'

after_success:
Expand All @@ -58,4 +62,4 @@ jobs:
Pkg.instantiate();
Pkg.build("CalibrateEmulateSample")'
- julia --color=yes --project=docs/ docs/make.jl
after_success: skip
after_success: skip
3 changes: 2 additions & 1 deletion test/Cloudy/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@

# Import Cloudy modules
using Pkg; Pkg.add(PackageSpec(url="https://github.com/climate-machine/Cloudy.jl"))
# using Pkg; Pkg.add("Cloudy"))
using Cloudy
using Cloudy.KernelTensors
PDistributions = Cloudy.Distributions
PDistributions = Cloudy.ParticleDistributions
Pkg.add("Plots")

# Import modules
Expand Down