From 16b7e1d5d0e2f4c4823b2b9631f508f6d3037d07 Mon Sep 17 00:00:00 2001 From: Will Daly Date: Tue, 10 Sep 2013 08:45:33 -0400 Subject: [PATCH 1/5] Test --- test_file.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test_file.txt diff --git a/test_file.txt b/test_file.txt new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/test_file.txt @@ -0,0 +1 @@ + From b586b419b37c27a68f4562de6bdcdec02ce9aae8 Mon Sep 17 00:00:00 2001 From: Will Daly Date: Tue, 10 Sep 2013 08:46:48 -0400 Subject: [PATCH 2/5] Fixed travis yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 42259ab28c04..a860cd1f9b63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ --- before_script: "bundle install" -script: "rake install prereqs" +script: "rake install_prereqs" From a2f48c7794c68b980aef56e945db142db6165847 Mon Sep 17 00:00:00 2001 From: Will Daly Date: Tue, 10 Sep 2013 08:49:42 -0400 Subject: [PATCH 3/5] Better prereqs --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a860cd1f9b63..83e95d8d9889 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ --- -before_script: "bundle install" +before_script: + - "bundle install" + - "sudo apt-get update -qq" + - "sudo apt-get install -qq python-scipy" script: "rake install_prereqs" From da21d4d1b5dfc466a0f02d2723ac807f79360fd9 Mon Sep 17 00:00:00 2001 From: Will Daly Date: Tue, 10 Sep 2013 08:54:04 -0400 Subject: [PATCH 4/5] Added numpy with apt-get to get latest version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 83e95d8d9889..223539b9ccc6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,5 @@ before_script: - "bundle install" - "sudo apt-get update -qq" - - "sudo apt-get install -qq python-scipy" + - "sudo apt-get install -qq python-numpy python-scipy" script: "rake install_prereqs" From e3ab8cb49329f00c1a1814c3a57243b6f12f8860 Mon Sep 17 00:00:00 2001 From: Will Daly Date: Tue, 10 Sep 2013 09:03:11 -0400 Subject: [PATCH 5/5] downgrade numpy --- requirements/edx/pre.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/pre.txt b/requirements/edx/pre.txt index dd00da4e8834..046ce0717784 100644 --- a/requirements/edx/pre.txt +++ b/requirements/edx/pre.txt @@ -6,4 +6,4 @@ # Numpy and scipy can't be installed in the same pip run. # Install numpy before other things to help resolve the problem. -numpy==1.6.2 +numpy==1.6.1