From ef28c52f77076d50f23e458fec8f5f44c25dc443 Mon Sep 17 00:00:00 2001
From: Art Wild <wildart@gmail.com>
Date: Fri, 19 Dec 2014 13:45:19 -0500
Subject: [PATCH] updated package requirements and travis config

---
 .travis.yml      | 11 +++--------
 REQUIRE          |  1 +
 test/REQUIRE     |  5 +++++
 test/runtests.jl |  5 -----
 4 files changed, 9 insertions(+), 13 deletions(-)
 create mode 100644 test/REQUIRE

diff --git a/.travis.yml b/.travis.yml
index c4db0bc..08dd345 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,18 +8,13 @@ env:
     - JULIAVERSION="juliareleases"
     - JULIAVERSION="julianightlies"
 before_install:
-  #- wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
-  #- chmod +x miniconda.sh
-  #- ./miniconda.sh -b
-  #- export PATH=/home/travis/miniconda/bin:$PATH
-  #- conda update --yes conda
-  #- conda install --yes matplotlib
   - sudo add-apt-repository ppa:staticfloat/julia-deps -y
   - sudo add-apt-repository ppa:staticfloat/${JULIAVERSION} -y
   - sudo apt-get update -qq -y
   - sudo apt-get install libpcre3-dev julia python-matplotlib -y
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
 script:
-  - xvfb-run julia -e 'Pkg.init(); Pkg.add("PyPlot"); Pkg.add("Winston"); Pkg.add("Cairo"); Pkg.add("Gadfly"); Pkg.clone(pwd()); Pkg.test("Weave", coverage=true)'
+  - julia -e 'Pkg.init(); Pkg.clone(pwd()); Pkg.resolve();'
+  - xvfb-run julia -e 'Pkg.test("Weave", coverage=true)'
 after_success:
-  - julia -e 'cd(Pkg.dir("Weave")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
+  - julia -e 'cd(Pkg.dir("Weave")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
\ No newline at end of file
diff --git a/REQUIRE b/REQUIRE
index e7128ad..fc54a59 100644
--- a/REQUIRE
+++ b/REQUIRE
@@ -1,2 +1,3 @@
+julia 0.3
 Compat
 TextWrap
diff --git a/test/REQUIRE b/test/REQUIRE
new file mode 100644
index 0000000..ef42477
--- /dev/null
+++ b/test/REQUIRE
@@ -0,0 +1,5 @@
+julia 0.3
+Cairo
+Gadfly
+Winston
+PyPlot
\ No newline at end of file
diff --git a/test/runtests.jl b/test/runtests.jl
index 7f83351..5c9a34a 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,14 +1,9 @@
 using Weave
 using Base.Test
-Pkg.add("Gadfly")
-Pkg.add("Cairo")
-Pkg.add("Winston")
-
 
 include("chunk_options.jl")
 #include("pyplot_formats.jl") cause segfaults, but OK if run by itself
 
-
 #Test Gadfly and markdown reader, Gadfly only works with 0.3
 if VERSION.minor == 3
     weave("documents/gadfly_markdown_test.jmd", doctype="github",plotlib="gadfly", informat="markdown")