Merge branch 'master' into xgboost_1.2

Author: icywang86rui

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## v2.12.0 (2020-09-29)
+
+### Features
+
+ * upgrade Neo MxNet to 1.7
+
+## v2.11.0 (2020-09-28)
+
+### Features
+
+ * Add SDK support for SparkML Serving Container version 2.4
+
+### Bug Fixes and Other Changes
+
+ * pin pytest version <6.1.0 to avoid pytest-rerunfailures breaking changes
+ * temporarily skip the MxNet Neo test until we fix them
+
+### Documentation Changes
+
+ * fix conda setup for docs
+
 ## v2.10.0 (2020-09-23)
 
 ### Features

VERSION

@@ -1 +1 @@
-2.10.1.dev0
+2.12.1.dev0

setup.py

@@ -61,7 +61,7 @@ def read_version():
         extras["all"],
         "tox",
         "flake8",
-        "pytest",
+        "pytest<6.1.0",
         "pytest-cov",
         "pytest-rerunfailures",
         "pytest-xdist",