Merge branch 'master' into mlog

demo/README.md

@@ -116,6 +116,7 @@ Send a PR to add a one sentence description:)
 ## Tools using XGBoost
 
 - [BayesBoost](https://github.com/mpearmain/BayesBoost) - Bayesian Optimization using xgboost and sklearn API
+- [gp_xgboost_gridsearch](https://github.com/vatsan/gp_xgboost_gridsearch) - In-database parallel grid-search for XGBoost on [Greenplum](https://github.com/greenplum-db/gpdb) using PL/Python 
 
 ## Awards
 - [John Chambers Award](http://stat-computing.org/awards/jmc/winners.html) - 2016 Winner: XGBoost R Package, by Tong He (Simon Fraser University) and Tianqi Chen (University of Washington)

python-package/setup.py

@@ -23,7 +23,8 @@ print("Install libxgboost from: %s" % LIB_PATH)
 setup(name='xgboost',
       version=open(os.path.join(CURRENT_DIR, 'xgboost/VERSION')).read().strip(),
       #version='0.4a23',
-      description=open(os.path.join(CURRENT_DIR, 'README.rst')).read(),
+      description = "XGBoost Python Package",
+      long_description=open(os.path.join(CURRENT_DIR, 'README.rst')).read(),
       install_requires=[
           'numpy',
           'scipy',

tests/python/test_basic.py

@@ -183,11 +183,10 @@ class TestBasic(unittest.TestCase):
         assert dm.num_col() == 2
 
     def test_load_file_invalid(self):
-
-        self.assertRaises(ValueError, xgb.Booster,
+        self.assertRaises(xgb.core.XGBoostError, xgb.Booster,
                           model_file='incorrect_path')
 
-        self.assertRaises(ValueError, xgb.Booster,
+        self.assertRaises(xgb.core.XGBoostError, xgb.Booster,
                           model_file=u'不正なパス')
 
     def test_dmatrix_numpy_init(self):