Updated travis configuration to go back to installing sklearn via pip…

…. Also added test_skll.py-generated files to .gitignore.
EducationalTestingService · Aug 8, 2013 · a7818c9 · a7818c9
1 parent 6937303
commit a7818c9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,15 @@ build/
 __pycache__
 
 .DS_Store
+
+tests/test_cv_folds1.cfg
+tests/test_cv_folds1.jsonlines
+tests/test_cv_folds2.cfg
+tests/test_regression1.cfg
+tests/test_regression1.jsonlines
+tests/tests_cv_test_cv_folds1_LogisticRegression_unscaled_tuned_accuracy_cross-validate.log
+tests/tests_cv_test_cv_folds1_LogisticRegression_unscaled_tuned_accuracy_cross-validate.predictions
+tests/tests_cv_test_cv_folds1_LogisticRegression_unscaled_tuned_accuracy_cross-validate.results
+tests/tests_cv_test_regression1_RescaledRidge_unscaled_tuned_pearson_cross-validate.log
+tests/tests_cv_test_regression1_RescaledRidge_unscaled_tuned_pearson_cross-validate.predictions
+tests/tests_cv_test_regression1_RescaledRidge_unscaled_tuned_pearson_cross-validate.results
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ virtualenv:
     system_site_packages: true
 before_install:
     - sudo apt-get update -qq
-    - sudo apt-get install -qq python-scipy python-nose python-sklearn
+    - sudo apt-get install -qq python-scipy python-nose
 install:
   - "pip install -r requirements.txt --use-mirrors"
   - sudo rm -rf /dev/shm