Merge #31

31: Fix build r=charleskawczynski a=charleskawczynski

 - Temporarily fixes the build. Once [#9259](JuliaRegistries/General#9259) merges, we can pin a specific version for this example so that this build doesn't break with changes to `Cloudy.jl`'s master

Thanks to @rohanmclure (co-authored)!

Co-authored-by: Charles Kawczynski <[email protected]>

Author: bors[bot]

.travis.yml

@@ -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
@@ -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:
@@ -58,4 +62,4 @@ jobs:
                                                       Pkg.instantiate();
                                                       Pkg.build("CalibrateEmulateSample")'
         - julia --color=yes --project=docs/ docs/make.jl
-      after_success: skip
+      after_success: skip

test/Cloudy/runtests.jl

@@ -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