From 5bd8a0c01287141ddcf09c654214a3de28c8afad Mon Sep 17 00:00:00 2001 From: Matthias Feurer Date: Fri, 7 May 2021 17:24:11 +0200 Subject: [PATCH 1/5] rename master to main --- doc/usage.rst | 4 ++-- examples/30_extended/custom_flow_.py | 4 ++-- examples/40_paper/2015_neurips_feurer_example.py | 2 +- openml/cli.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/usage.rst b/doc/usage.rst index fd7d5fbec..3915ac630 100644 --- a/doc/usage.rst +++ b/doc/usage.rst @@ -71,9 +71,9 @@ Docker It is also possible to try out the latest development version of ``openml-python`` with docker: -``` +.. code:: bash + docker run -it openml/openml-python -``` See the `openml-python docker documentation `_ for more information. diff --git a/examples/30_extended/custom_flow_.py b/examples/30_extended/custom_flow_.py index 1259acf57..ae5f37631 100644 --- a/examples/30_extended/custom_flow_.py +++ b/examples/30_extended/custom_flow_.py @@ -4,7 +4,7 @@ ================================ The most convenient way to create a flow for your machine learning workflow is to generate it -automatically as described in the `Obtain Flow IDs `_ tutorial. # noqa E501 +automatically as described in the :ref:`sphx_glr_examples_30_extended_flow_id_tutorial.py` tutorial. However, there are scenarios where this is not possible, such as when the flow uses a framework without an extension or when the flow is described by a script. @@ -31,7 +31,7 @@ # 1. Defining the flow # ==================== # The first step is to define all the hyperparameters of your flow. -# The API pages feature a descriptions of each variable of the `OpenMLFlow `_. # noqa E501 +# The API pages feature a descriptions of each variable of the :class:`openml.flows.OpenMLFlow`. # Note that `external version` and `name` together uniquely identify a flow. # # The AutoML Benchmark runs AutoML systems across a range of tasks. diff --git a/examples/40_paper/2015_neurips_feurer_example.py b/examples/40_paper/2015_neurips_feurer_example.py index 721186016..3960c3852 100644 --- a/examples/40_paper/2015_neurips_feurer_example.py +++ b/examples/40_paper/2015_neurips_feurer_example.py @@ -4,7 +4,7 @@ A tutorial on how to get the datasets used in the paper introducing *Auto-sklearn* by Feurer et al.. -Auto-sklearn website: https://automl.github.io/auto-sklearn/master/ +Auto-sklearn website: https://automl.github.io/auto-sklearn/ Publication ~~~~~~~~~~~ diff --git a/openml/cli.py b/openml/cli.py index b26e67d2e..246a2092a 100644 --- a/openml/cli.py +++ b/openml/cli.py @@ -303,7 +303,7 @@ def main() -> None: parser_configure = subparsers.add_parser( "configure", description="Set or read variables in your configuration file. For more help also see " - "'https://openml.github.io/openml-python/master/usage.html#configuration'.", + "'https://openml.github.io/openml-python/main/usage.html#configuration'.", ) configurable_fields = [f for f in config._defaults if f not in ["max_retries"]] From dd690ad469630109e0ce4f4bbd4d94114611f727 Mon Sep 17 00:00:00 2001 From: Matthias Feurer Date: Fri, 7 May 2021 20:51:57 +0200 Subject: [PATCH 2/5] update changelog --- doc/progress.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/progress.rst b/doc/progress.rst index 5b3aae784..f304bc989 100644 --- a/doc/progress.rst +++ b/doc/progress.rst @@ -8,8 +8,10 @@ Changelog 0.12.2 ~~~~~~ + * ADD #1075: A docker image is now automatically built on a push to develop. It can be used to build docs or run tests in an isolated environment. * DOC: Fixes a few broken links in the documentation. +* MAINT: Rename `master` brach to ` main` branch. * MAINT/DOC: Automatically check for broken external links when building the documentation. * MAINT/DOC: Fail documentation building on warnings. This will make the documentation building fail if a reference cannot be found (i.e. an internal link is broken). From 2a6679e66ffa282d875cf0a020fb39f8aa694917 Mon Sep 17 00:00:00 2001 From: Matthias Feurer Date: Fri, 7 May 2021 20:58:40 +0200 Subject: [PATCH 3/5] fix documentation building script --- .github/workflows/docs.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index ab83aef5c..c14bd07d0 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -22,19 +22,19 @@ jobs: cd doc make linkcheck - name: Pull latest gh-pages - if: (contains(github.ref, 'develop') || contains(github.ref, 'master')) && github.event_name == 'push' + if: (contains(github.ref, 'develop') || contains(github.ref, 'main')) && github.event_name == 'push' run: | cd .. git clone https://github.com/openml/openml-python.git --branch gh-pages --single-branch gh-pages - name: Copy new doc into gh-pages - if: (contains(github.ref, 'develop') || contains(github.ref, 'master')) && github.event_name == 'push' + if: (contains(github.ref, 'develop') || contains(github.ref, 'main')) && github.event_name == 'push' run: | branch_name=${GITHUB_REF##*/} cd ../gh-pages rm -rf $branch_name cp -r ../openml-python/doc/build/html $branch_name - name: Push to gh-pages - if: (contains(github.ref, 'develop') || contains(github.ref, 'master')) && github.event_name == 'push' + if: (contains(github.ref, 'develop') || contains(github.ref, 'main')) && github.event_name == 'push' run: | last_commit=$(git log --pretty=format:"%an: %s") cd ../gh-pages From 268c610bd0a853c1afd2bebf45f726d4fff0e2c5 Mon Sep 17 00:00:00 2001 From: Matthias Feurer Date: Wed, 12 May 2021 09:54:11 +0200 Subject: [PATCH 4/5] rename master to main in all remaining docs --- CONTRIBUTING.md | 6 +++--- PULL_REQUEST_TEMPLATE.md | 2 +- README.md | 4 ++-- doc/contributing.rst | 6 +++--- doc/usage.rst | 3 ++- docker/startup.sh | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3351bc36d..688dbd7a9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ This document describes the workflow on how to contribute to the openml-python package. If you are interested in connecting a machine learning package with OpenML (i.e. -write an openml-python extension) or want to find other ways to contribute, see [this page](https://openml.github.io/openml-python/master/contributing.html#contributing). +write an openml-python extension) or want to find other ways to contribute, see [this page](https://openml.github.io/openml-python/main/contributing.html#contributing). Scope of the package -------------------- @@ -20,7 +20,7 @@ keep the number of potential installation dependencies as low as possible. Therefore, the connection to other machine learning libraries such as *pytorch*, *keras* or *tensorflow* should not be done directly inside this package, but in a separate package using the OpenML Python connector. -More information on OpenML Python connectors can be found [here](https://openml.github.io/openml-python/master/contributing.html#contributing). +More information on OpenML Python connectors can be found [here](https://openml.github.io/openml-python/main/contributing.html#contributing). Reporting bugs -------------- @@ -100,7 +100,7 @@ local disk: $ git checkout -b feature/my-feature ``` - Always use a ``feature`` branch. It's good practice to never work on the ``master`` or ``develop`` branch! + Always use a ``feature`` branch. It's good practice to never work on the ``main`` or ``develop`` branch! To make the nature of your pull request easily visible, please prepend the name of the branch with the type of changes you want to merge, such as ``feature`` if it contains a new feature, ``fix`` for a bugfix, ``doc`` for documentation and ``maint`` for other maintenance on the package. 4. Develop the feature on your feature branch. Add changed files using ``git add`` and then ``git commit`` files: diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 47a5741e6..f0bee81e0 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@ -This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! \ No newline at end of file +This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! diff --git a/doc/contributing.rst b/doc/contributing.rst index e87a02dfb..c8fd5347a 100644 --- a/doc/contributing.rst +++ b/doc/contributing.rst @@ -10,7 +10,7 @@ Contribution to the OpenML package is highly appreciated in all forms. In particular, a few ways to contribute to openml-python are: * A direct contribution to the package, by means of improving the - code, documentation or examples. To get started, see `this file `_ + code, documentation or examples. To get started, see `this file `_ with details on how to set up your environment to develop for openml-python. * A contribution to an openml-python extension. An extension package allows OpenML to interface @@ -19,13 +19,13 @@ In particular, a few ways to contribute to openml-python are: For more information, see the :ref:`extensions` below. * Bug reports. If something doesn't work for you or is cumbersome, please open a new issue to let - us know about the problem. See `this section `_. + us know about the problem. See `this section `_. * `Cite OpenML `_ if you use it in a scientific publication. * Visit one of our `hackathons `_. - * Contribute to another OpenML project, such as `the main OpenML project `_. + * Contribute to another OpenML project, such as `the main OpenML project `_. .. _extensions: diff --git a/doc/usage.rst b/doc/usage.rst index 3915ac630..b720a7ef4 100644 --- a/doc/usage.rst +++ b/doc/usage.rst @@ -40,7 +40,8 @@ directory of the user and is called config. It consists of ``key = value`` pairs which are separated by newlines. The following keys are defined: * apikey: - * required to access the server. The `OpenML setup `_ describes how to obtain an API key. + * required to access the server. The :ref:`sphx_glr_examples_20_basic_introduction_tutorial.py` + describes how to obtain an API key. * server: * default: ``http://www.openml.org``. Alternatively, use ``test.openml.org`` for the test server. diff --git a/docker/startup.sh b/docker/startup.sh index 1946a69cc..5c5ff0b68 100644 --- a/docker/startup.sh +++ b/docker/startup.sh @@ -58,7 +58,7 @@ fi source /omlp/venv/bin/activate cd $code_dir -# The most recent ``master`` is already installed, but we want to update any outdated dependencies +# The most recent ``main`` is already installed, but we want to update any outdated dependencies pip install -e .[test,examples,docs,examples_unix] if [ "$1" == "test" ]; then From 9b97b146f72a4808d93809d1857d3fbeae9dcfcf Mon Sep 17 00:00:00 2001 From: Matthias Feurer Date: Fri, 14 May 2021 13:12:48 +0200 Subject: [PATCH 5/5] drop badges --- README.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/README.md b/README.md index c001a0708..1002052fb 100644 --- a/README.md +++ b/README.md @@ -13,18 +13,6 @@ It can be used to download or upload OpenML data such as datasets and machine le [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) -Main branch: - -[![Build Status](https://travis-ci.org/openml/openml-python.svg?branch=master)](https://travis-ci.org/openml/openml-python) -[![Build status](https://ci.appveyor.com/api/projects/status/blna1eip00kdyr25?svg=true)](https://ci.appveyor.com/project/OpenML/openml-python) -[![Coverage Status](https://coveralls.io/repos/github/openml/openml-python/badge.svg?branch=master)](https://coveralls.io/github/openml/openml-python?branch=master) - -Development branch: - -[![Build Status](https://travis-ci.org/openml/openml-python.svg?branch=develop)](https://travis-ci.org/openml/openml-python) -[![Build status](https://ci.appveyor.com/api/projects/status/blna1eip00kdyr25/branch/develop?svg=true)](https://ci.appveyor.com/project/OpenML/openml-python/branch/develop) -[![Coverage Status](https://coveralls.io/repos/github/openml/openml-python/badge.svg?branch=develop)](https://coveralls.io/github/openml/openml-python?branch=develop) - ## Citing OpenML-Python If you use OpenML-Python in a scientific publication, we would appreciate a reference to the