Merge pull request #347 from openml/develop

Create a new release to update docs

Author: mfeurer

.gitignore

@@ -73,6 +73,3 @@ target/
 # IDE
 .idea
 *.swp
-
-# Other
-*.pkl

.travis.yml

@@ -15,10 +15,12 @@ env:
   - TEST_DIR=/tmp/test_dir/
   - MODULE=openml
   matrix:
-  - DISTRIB="conda" PYTHON_VERSION="2.7" NUMPY_VERSION="1.11" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.21" SKLEARN_VERSION="0.18.1"
-  - DISTRIB="conda" PYTHON_VERSION="3.4" NUMPY_VERSION="1.11" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.4" SKLEARN_VERSION="0.18.1"
-  - DISTRIB="conda" PYTHON_VERSION="3.5" NUMPY_VERSION="1.11" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.4" SKLEARN_VERSION="0.18.1"
-  - DISTRIB="conda" PYTHON_VERSION="3.6" COVERAGE="true" NUMPY_VERSION="1.12.1" SCIPY_VERSION="0.19.0" CYTHON_VERSION="0.25.2" SKLEARN_VERSION="0.18.1"
+  - DISTRIB="conda" PYTHON_VERSION="2.7" SKLEARN_VERSION="0.18.2"
+  - DISTRIB="conda" PYTHON_VERSION="3.4" SKLEARN_VERSION="0.18.2"
+  - DISTRIB="conda" PYTHON_VERSION="3.5" SKLEARN_VERSION="0.18.2"
+  - DISTRIB="conda" PYTHON_VERSION="3.6" COVERAGE="true" SKLEARN_VERSION="0.18.2"
+  - DISTRIB="conda" PYTHON_VERSION="3.6" EXAMPLES="true" SKLEARN_VERSION="0.18.2"
+  - DISTRIB="conda" PYTHON_VERSION="3.6" DOCTEST="true" SKLEARN_VERSION="0.18.2"
 
 install: source ci_scripts/install.sh
 script: bash ci_scripts/test.sh

README.md

@@ -1,3 +1,5 @@
+[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
+
 A python interface for [OpenML](http://openml.org). You can find the documentation on the [openml-python website](https://openml.github.io/openml-python).
 
 Please commit to the right branches following the gitflow pattern:

ci_scripts/install.sh

@@ -24,12 +24,18 @@ popd
 
 # Configure the conda environment and put it in the path using the
 # provided versions
-conda create -n testenv --yes python=$PYTHON_VERSION pip nose \
-   numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION cython=$CYTHON_VERSION  \
-   scikit-learn=$SKLEARN_VERSION pandas
+conda create -n testenv --yes python=$PYTHON_VERSION pip
 source activate testenv
+pip install nose numpy scipy cython scikit-learn==$SKLEARN_VERSION \
+    oslo.concurrency
 
-pip install matplotlib jupyter notebook nbconvert nbformat jupyter_client ipython ipykernel
+if [[ "$EXAMPLES" == "true" ]]; then
+    pip install matplotlib jupyter notebook nbconvert nbformat jupyter_client \
+        ipython ipykernel pandas seaborn
+fi
+if [[ "$DOCTEST" == "true" ]]; then
+    pip install pandas sphinx_bootstrap_theme
+fi
 if [[ "$COVERAGE" == "true" ]]; then
     pip install codecov
 fi

ci_scripts/test.sh

@@ -6,11 +6,16 @@ mkdir -p $TEST_DIR
 
 cwd=`pwd`
 test_dir=$cwd/tests
+doctest_dir=$cwd/doc
 
 cd $TEST_DIR
 
-if [[ "$COVERAGE" == "true" ]]; then
-    nosetests -sv --with-coverage --cover-package=$MODULE $test_dir
+if [[ "$EXAMPLES" == "true" ]]; then
+    nosetests -sv $test_dir/test_examples/
+elif [[ "$DOCTEST" == "true" ]]; then
+    python -m doctest $doctest_dir/usage.rst
+elif [[ "$COVERAGE" == "true" ]]; then
+    nosetests --processes=4 --process-timeout=600 -sv --ignore-files="test_OpenMLDemo\.py" --with-coverage --cover-package=$MODULE $test_dir
 else
-    nosetests -sv $test_dir
+    nosetests --processes=4 --process-timeout=600 -sv --ignore-files="test_OpenMLDemo\.py" $test_dir
 fi

doc/conf.py

@@ -63,8 +63,8 @@
 
 # General information about the project.
 project = u'OpenML'
-copyright = u'2014-2016, Matthias Feurer, Andreas Müller, Farzan Majdani, ' \
-            u'Joaquin Vanschoren and Pieter Gijsbers'
+copyright = u'2014-2017, Matthias Feurer, Andreas Müller, Farzan Majdani, ' \
+            u'Joaquin Vanschoren, Jan van Rijn and Pieter Gijsbers'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the