Skip to content

Commit bb17e72

Browse files
mfeurerPGijsbers
andauthored
Rename master to main (#1076)
* rename master to main * update changelog * fix documentation building script * rename master to main in all remaining docs * drop badges Co-authored-by: PGijsbers <p.gijsbers@tue.nl>
1 parent c8cfc90 commit bb17e72

File tree

11 files changed

+20
-32
lines changed

11 files changed

+20
-32
lines changed

.github/workflows/docs.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ jobs:
2222
cd doc
2323
make linkcheck
2424
- name: Pull latest gh-pages
25-
if: (contains(github.ref, 'develop') || contains(github.ref, 'master')) && github.event_name == 'push'
25+
if: (contains(github.ref, 'develop') || contains(github.ref, 'main')) && github.event_name == 'push'
2626
run: |
2727
cd ..
2828
git clone https://github.com/openml/openml-python.git --branch gh-pages --single-branch gh-pages
2929
- name: Copy new doc into gh-pages
30-
if: (contains(github.ref, 'develop') || contains(github.ref, 'master')) && github.event_name == 'push'
30+
if: (contains(github.ref, 'develop') || contains(github.ref, 'main')) && github.event_name == 'push'
3131
run: |
3232
branch_name=${GITHUB_REF##*/}
3333
cd ../gh-pages
3434
rm -rf $branch_name
3535
cp -r ../openml-python/doc/build/html $branch_name
3636
- name: Push to gh-pages
37-
if: (contains(github.ref, 'develop') || contains(github.ref, 'master')) && github.event_name == 'push'
37+
if: (contains(github.ref, 'develop') || contains(github.ref, 'main')) && github.event_name == 'push'
3838
run: |
3939
last_commit=$(git log --pretty=format:"%an: %s")
4040
cd ../gh-pages

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This document describes the workflow on how to contribute to the openml-python package.
22
If you are interested in connecting a machine learning package with OpenML (i.e.
3-
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).
3+
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).
44

55
Scope of the package
66
--------------------
@@ -20,7 +20,7 @@ keep the number of potential installation dependencies as low as possible.
2020
Therefore, the connection to other machine learning libraries such as
2121
*pytorch*, *keras* or *tensorflow* should not be done directly inside this
2222
package, but in a separate package using the OpenML Python connector.
23-
More information on OpenML Python connectors can be found [here](https://openml.github.io/openml-python/master/contributing.html#contributing).
23+
More information on OpenML Python connectors can be found [here](https://openml.github.io/openml-python/main/contributing.html#contributing).
2424

2525
Reporting bugs
2626
--------------
@@ -100,7 +100,7 @@ local disk:
100100
$ git checkout -b feature/my-feature
101101
```
102102

103-
Always use a ``feature`` branch. It's good practice to never work on the ``master`` or ``develop`` branch!
103+
Always use a ``feature`` branch. It's good practice to never work on the ``main`` or ``develop`` branch!
104104
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.
105105

106106
4. Develop the feature on your feature branch. Add changed files using ``git add`` and then ``git commit`` files:

PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
Thanks for contributing a pull request to the OpenML python connector! Please ensure you have taken a look at
3-
the contribution guidelines: https://github.com/openml/openml-python/blob/master/CONTRIBUTING.md#Contributing-Pull-Requests
3+
the contribution guidelines: https://github.com/openml/openml-python/blob/main/CONTRIBUTING.md#Contributing-Pull-Requests
44
55
Please make sure that:
66

README.md

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,6 @@ It can be used to download or upload OpenML data such as datasets and machine le
1313

1414
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
1515

16-
Master branch:
17-
18-
[![Build Status](https://travis-ci.org/openml/openml-python.svg?branch=master)](https://travis-ci.org/openml/openml-python)
19-
[![Build status](https://ci.appveyor.com/api/projects/status/blna1eip00kdyr25?svg=true)](https://ci.appveyor.com/project/OpenML/openml-python)
20-
[![Coverage Status](https://coveralls.io/repos/github/openml/openml-python/badge.svg?branch=master)](https://coveralls.io/github/openml/openml-python?branch=master)
21-
22-
Development branch:
23-
24-
[![Build Status](https://travis-ci.org/openml/openml-python.svg?branch=develop)](https://travis-ci.org/openml/openml-python)
25-
[![Build status](https://ci.appveyor.com/api/projects/status/blna1eip00kdyr25/branch/develop?svg=true)](https://ci.appveyor.com/project/OpenML/openml-python/branch/develop)
26-
[![Coverage Status](https://coveralls.io/repos/github/openml/openml-python/badge.svg?branch=develop)](https://coveralls.io/github/openml/openml-python?branch=develop)
27-
2816
## Citing OpenML-Python
2917

3018
If you use OpenML-Python in a scientific publication, we would appreciate a reference to the
@@ -62,4 +50,4 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
6250
<!-- prettier-ignore-end -->
6351
<!-- ALL-CONTRIBUTORS-LIST:END -->
6452

65-
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
53+
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

doc/contributing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Contribution to the OpenML package is highly appreciated in all forms.
1010
In particular, a few ways to contribute to openml-python are:
1111

1212
* A direct contribution to the package, by means of improving the
13-
code, documentation or examples. To get started, see `this file <https://github.com/openml/openml-python/blob/master/CONTRIBUTING.md>`_
13+
code, documentation or examples. To get started, see `this file <https://github.com/openml/openml-python/blob/main/CONTRIBUTING.md>`_
1414
with details on how to set up your environment to develop for openml-python.
1515

1616
* 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:
1919
For more information, see the :ref:`extensions` below.
2020

2121
* Bug reports. If something doesn't work for you or is cumbersome, please open a new issue to let
22-
us know about the problem. See `this section <https://github.com/openml/openml-python/blob/master/CONTRIBUTING.md#user-content-reporting-bugs>`_.
22+
us know about the problem. See `this section <https://github.com/openml/openml-python/blob/main/CONTRIBUTING.md#user-content-reporting-bugs>`_.
2323

2424
* `Cite OpenML <https://www.openml.org/cite>`_ if you use it in a scientific publication.
2525

2626
* Visit one of our `hackathons <https://meet.openml.org/>`_.
2727

28-
* Contribute to another OpenML project, such as `the main OpenML project <https://github.com/openml/OpenML/blob/master/CONTRIBUTING.md>`_.
28+
* Contribute to another OpenML project, such as `the main OpenML project <https://github.com/openml/OpenML/blob/main/CONTRIBUTING.md>`_.
2929

3030
.. _extensions:
3131

doc/progress.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ Changelog
88

99
0.12.2
1010
~~~~~~
11+
1112
* ADD #1065: Add a ``retry_policy`` configuration option that determines the frequency and number of times to attempt to retry server requests.
1213
* 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.
1314
* DOC: Fixes a few broken links in the documentation.
15+
* MAINT: Rename `master` brach to ` main` branch.
1416
* MAINT/DOC: Automatically check for broken external links when building the documentation.
1517
* MAINT/DOC: Fail documentation building on warnings. This will make the documentation building
1618
fail if a reference cannot be found (i.e. an internal link is broken).

doc/usage.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ directory of the user and is called config. It consists of ``key = value`` pairs
4040
which are separated by newlines. The following keys are defined:
4141

4242
* apikey:
43-
* required to access the server. The `OpenML setup <https://openml.github.io/openml-python/master/examples/20_basic/introduction_tutorial.html#authentication>`_ describes how to obtain an API key.
43+
* required to access the server. The :ref:`sphx_glr_examples_20_basic_introduction_tutorial.py`
44+
describes how to obtain an API key.
4445

4546
* server:
4647
* default: ``http://www.openml.org``. Alternatively, use ``test.openml.org`` for the test server.
@@ -76,11 +77,8 @@ Docker
7677

7778
It is also possible to try out the latest development version of ``openml-python`` with docker:
7879

79-
8080
``docker run -it openml/openml-python``
8181

82-
83-
8482
See the `openml-python docker documentation <https://github.com/openml/openml-python/blob/main/docker/readme.md>`_ for more information.
8583

8684
~~~~~~~~~~~~

docker/startup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fi
5959

6060
source /omlp/venv/bin/activate
6161
cd $code_dir
62-
# The most recent ``master`` is already installed, but we want to update any outdated dependencies
62+
# The most recent ``main`` is already installed, but we want to update any outdated dependencies
6363
pip install -e .[test,examples,docs,examples_unix]
6464

6565
if [ "$1" == "test" ]; then

examples/30_extended/custom_flow_.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
================================
55
66
The most convenient way to create a flow for your machine learning workflow is to generate it
7-
automatically as described in the `Obtain Flow IDs <https://openml.github.io/openml-python/master/examples/30_extended/flow_id_tutorial.html#sphx-glr-examples-30-extended-flow-id-tutorial-py>`_ tutorial. # noqa E501
7+
automatically as described in the :ref:`sphx_glr_examples_30_extended_flow_id_tutorial.py` tutorial.
88
However, there are scenarios where this is not possible, such
99
as when the flow uses a framework without an extension or when the flow is described by a script.
1010
@@ -31,7 +31,7 @@
3131
# 1. Defining the flow
3232
# ====================
3333
# The first step is to define all the hyperparameters of your flow.
34-
# The API pages feature a descriptions of each variable of the `OpenMLFlow <https://openml.github.io/openml-python/master/generated/openml.OpenMLFlow.html#openml.OpenMLFlow>`_. # noqa E501
34+
# The API pages feature a descriptions of each variable of the :class:`openml.flows.OpenMLFlow`.
3535
# Note that `external version` and `name` together uniquely identify a flow.
3636
#
3737
# The AutoML Benchmark runs AutoML systems across a range of tasks.

examples/40_paper/2015_neurips_feurer_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
A tutorial on how to get the datasets used in the paper introducing *Auto-sklearn* by Feurer et al..
66
7-
Auto-sklearn website: https://automl.github.io/auto-sklearn/master/
7+
Auto-sklearn website: https://automl.github.io/auto-sklearn/
88
99
Publication
1010
~~~~~~~~~~~

0 commit comments

Comments
 (0)