Merge pull request #869 from holgern/0.7.X

Merge upstream changes to travis CI and fix example link in readme

.travis.yml

@@ -22,32 +22,32 @@ matrix:
     - name: "Python 3.5 - scikit 0.19.2"
       python: "3.7"
       env: DISTRIB="conda" PYTHON_VERSION="3.5"
-           NUMPY_VERSION="1.11.0" SCIPY_VERSION="0.18.0" PYAML_VERSION="16.9.0"
+           NUMPY_VERSION="1.12.0" SCIPY_VERSION="0.18.0" PYAML_VERSION="16.9.0"
            SCIKIT_LEARN_VERSION="0.19.2" MATPLOTLIB_VERSION="2.0.0" COVERAGE="false"
            JOBLIB_VERSION="0.11"
     - name: "Python 3.6 - scikit 0.20.4"
       python: "3.7"
       env: DISTRIB="conda" PYTHON_VERSION="3.6"
-           NUMPY_VERSION="1.12.0" SCIPY_VERSION="0.19.1" PYAML_VERSION="16.12.0"
+           NUMPY_VERSION="1.14.0" SCIPY_VERSION="0.19.1" PYAML_VERSION="16.12.0"
            SCIKIT_LEARN_VERSION="0.20.4" MATPLOTLIB_VERSION="2.0.0" COVERAGE="false"
            JOBLIB_VERSION="0.11"
     - name: "Python 3.7 - scikit 0.21.3"
       python: "3.7"
       env: DISTRIB="conda" PYTHON_VERSION="3.7"
-         NUMPY_VERSION="1.13.0" SCIPY_VERSION="1.0.0" PYAML_VERSION="17.8.0"
+         NUMPY_VERSION="1.16.0" SCIPY_VERSION="1.0.0" PYAML_VERSION="17.8.0"
          SCIKIT_LEARN_VERSION="0.21.3" MATPLOTLIB_VERSION="*" COVERAGE="true"
-         JOBLIB_VERSION="0.12"
-    - name: "Python 3.7 - scikit 0.22.1"
-      python: "3.7"
-      env: DISTRIB="conda" PYTHON_VERSION="3.7"
-         NUMPY_VERSION="1.14.0" SCIPY_VERSION="1.2.0" PYAML_VERSION="18.11.0"
-         SCIKIT_LEARN_VERSION="0.22.1" MATPLOTLIB_VERSION="*" COVERAGE="true"
          JOBLIB_VERSION="0.13"
-    - name: "Python 3.8  latest package versions"
+    - name: "Python 3.8  - scikit 0.22.1"
       python: "3.7"
       env: DISTRIB="conda" PYTHON_VERSION="3.8.1" COVERAGE="false"
            NUMPY_VERSION="1.18.1" SCIPY_VERSION="1.4.1" PYAML_VERSION="19.12.0"
            SCIKIT_LEARN_VERSION="0.22.1" JOBLIB_VERSION="0.14.1"
+    - name: "Python 3.7 - sdist check"
+      python: "3.7"
+      env: DISTRIB="conda" PYTHON_VERSION="3.7"
+           NUMPY_VERSION="*" SCIPY_VERSION="*" PYAML_VERSION="*"
+           SCIKIT_LEARN_VERSION="*" MATPLOTLIB_VERSION="*" COVERAGE="false"
+           JOBLIB_VERSION="*" SDIST="true"
 
 
 install: source build_tools/travis/install.sh

README.rst

@@ -29,8 +29,7 @@ Important links
 
 -  Static documentation - `Static
    documentation <https://scikit-optimize.github.io/>`__
--  Example notebooks - can be found in
-   `here <https://scikit-optimize.github.io/stable/auto_examples/index.html>`_.
+-  Example notebooks - can be found in examples_.
 -  Issue tracker -
    https://github.com/scikit-optimize/scikit-optimize/issues
 -  Releases - https://pypi.python.org/pypi/scikit-optimize
@@ -98,8 +97,7 @@ class:
 
 Read our `introduction to bayesian
 optimization <https://scikit-optimize.github.io/stable/auto_examples/bayesian-optimization.html>`__
-and the other
-`examples <https://scikit-optimize.github.io/stable/auto_examples/index.html>`__.
+and the other examples_.
 
 
 Development
@@ -139,7 +137,7 @@ create a new issue and work through the following checklist:
 * update the version tag in ``__init__.py``
 * update the version tag mentioned in the README
 * check if the dependencies in ``setup.py`` are valid or need unpinning
-* check that the ``CHANGELOG.md`` is up to date
+* check that the ``doc/whats_new/v0.X.rst`` is up to date
 * did the last build of master succeed?
 * create a `new release <https://github.com/scikit-optimize/scikit-optimize/releases>`__
 * ping `conda-forge <https://github.com/conda-forge/scikit-optimize-feedstock>`__
@@ -198,3 +196,4 @@ recognition, feel free to add them to the "Made possible by" list.
    :target: https://gitter.im/scikit-optimize/Lobby
 .. |Zenodo DOI| image:: https://zenodo.org/badge/54340642.svg
    :target: https://zenodo.org/badge/latestdoi/54340642
+.. _examples: https://scikit-optimize.github.io/stable/auto_examples/index.html

build_tools/travis/install.sh

@@ -64,7 +64,12 @@ if [[ "$COVERAGE" == "true" ]]; then
     pip install pytest-cov coverage coveralls
 fi
 
-pip install -e '.[plots]'
+if [[ "$SDIST" == "true" ]]; then
+    python setup.py sdist
+    pip install twine
+else
+    pip install -e '.[plots]'
+fi
 python --version
 python -c "import numpy; print('numpy %s' % numpy.__version__)"
 python -c "import scipy; print('scipy %s' % scipy.__version__)"

build_tools/travis/test_script.sh

@@ -1,4 +1,9 @@
 #!/bin/bash
+#
+# Copied from https://github.com/scikit-learn/scikit-learn/blob/master/build_tools/travis/test_script.sh
+# The scikit-learn developers.
+# License: BSD-style
+#
 # This script is meant to be called by the "script" step defined in
 # .travis.yml. See https://docs.travis-ci.com/ for more details.
 # The behavior of the script is controlled by environment variabled defined
@@ -11,10 +16,11 @@ set -e
 python --version
 python -c "import numpy; print('numpy %s' % numpy.__version__)"
 python -c "import scipy; print('scipy %s' % scipy.__version__)"
+python -c "import sklearn; print('sklearn %s' % sklearn.__version__)"
 python -c "\
 try:
-    import sklearn
-    print('sklearn %s' % sklearn.__version__)
+    import skopt
+    print('skopt %s' % skopt.__version__)
 except ImportError:
     pass
 "
@@ -36,7 +42,7 @@ run_tests() {
     export SKOPT_SKIP_NETWORK_TESTS=1
 
     if [[ "$COVERAGE" == "true" ]]; then
-        TEST_CMD="$TEST_CMD --cov sklearn"
+        TEST_CMD="$TEST_CMD --cov skopt"
     fi
 
     if [[ -n "$CHECK_WARNINGS" ]]; then
@@ -48,4 +54,15 @@ run_tests() {
     $TEST_CMD skopt
 }
 
-run_tests
+run_package_check() {
+
+    TEST_CMD="twine check dist/*"
+    set -x
+    $TEST_CMD
+}
+
+if [[ "$SDIST" == "true" ]]; then
+    run_package_check
+else
+    run_tests
+fi