Skip to content

Commit 05d3b22

Browse files
committed
rename master to main wherever possible, fix (some) broken links
1 parent 54871b5 commit 05d3b22

File tree

19 files changed

+53
-53
lines changed

19 files changed

+53
-53
lines changed

.binder/README

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
This directory holds configuration files for https://mybinder.org/.
22

33
The interactive notebooks can be accessed with this link:
4-
https://mybinder.org/v2/gh/jupyter-widgets/ipywidgets/master?filepath=docs/source/examples
4+
https://mybinder.org/v2/gh/jupyter-widgets/ipywidgets/main?filepath=docs/source/examples
55

6-
To check out a different version, just replace "master" with the desired
6+
To check out a different version, just replace `main` with the desired
77
branch/tag name or commit hash.
88

99
To use JupyterLab, use:
10-
https://mybinder.org/v2/gh/jupyter-widgets/ipywidgets/master?urlpath=lab/tree/docs/source/examples
10+
https://mybinder.org/v2/gh/jupyter-widgets/ipywidgets/main?urlpath=lab/tree/docs/source/examples

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build jupyterlab_widgets
22

33
on:
44
push:
5-
branches: master
5+
branches: main
66
pull_request:
77
branches: '*'
88

.github/workflows/devinstall.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Run the dev-install script
22

33
on:
44
push:
5-
branches: master
5+
branches: main
66
pull_request:
77
branches: '*'
88

.github/workflows/packaging.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: Packaging
22

33
on:
44
push:
5-
branches: [master]
5+
branches:
6+
- main
67
pull_request:
78
branches: '*'
89

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
| Purpose | Badges |
44
| ------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
5-
| **Latest (master: future 8.0)** | [![Test Status](https://github.com/jupyter-widgets/ipywidgets/actions/workflows/tests.yml/badge.svg?query=branch%3Amaster)](https://github.com/jupyter-widgets/ipywidgets/actions?query=branch%3Amaster) [![Documentation Status: latest](https://img.shields.io/readthedocs/ipywidgets?logo=read-the-docs)](https://ipywidgets.readthedocs.io/en/latest/?badge=latest) [![Binder:master](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-widgets/ipywidgets/master?urlpath=lab/tree/docs%2Fsource%2Fexamples) |
5+
| **Latest (`main`: future 8.0)** | [![Test Status](https://github.com/jupyter-widgets/ipywidgets/actions/workflows/tests.yml/badge.svg?query=branch%3Amain)](https://github.com/jupyter-widgets/ipywidgets/actions?query=branch%3Amain) [![Documentation Status: latest](https://img.shields.io/readthedocs/ipywidgets?logo=read-the-docs)](https://ipywidgets.readthedocs.io/en/latest/?badge=latest) [![Binder:main](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-widgets/ipywidgets/main?urlpath=lab/tree/docs%2Fsource%2Fexamples) |
66
| **Stable** | [![Version](https://img.shields.io/pypi/v/ipywidgets.svg?logo=pypi)](https://pypi.python.org/pypi/ipywidgets) [![Conda Version](https://img.shields.io/conda/vn/conda-forge/ipywidgets.svg?logo=conda-forge)](https://anaconda.org/conda-forge/ipywidgets) [![Documentation Status](https://img.shields.io/readthedocs/ipywidgets?logo=read-the-docs)](https://ipywidgets.readthedocs.io/en/stable/?badge=stable) [![Binder:7.x](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-widgets/ipywidgets/7.x?urlpath=lab/tree/docs%2Fsource%2Fexamples) |
77
| **Communication** | [![Join the chat at https://gitter.im/ipython/ipywidgets](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jupyter-widgets/Lobby) [![Discourse](https://img.shields.io/badge/help_forum-discourse-blue?logo=discourse)](https://discourse.jupyter.org/c/widgets/46) |
88
| | |
99

1010
**ipywidgets**, also known as jupyter-widgets or simply widgets, are
11-
[interactive HTML widgets](https://github.com/jupyter-widgets/ipywidgets/blob/master/docs/source/examples/Index.ipynb)
11+
[interactive HTML widgets](https://github.com/jupyter-widgets/ipywidgets/blob/main/docs/source/examples/Index.ipynb)
1212
for Jupyter notebooks and the IPython kernel.
1313

1414
Notebooks come alive when interactive widgets are used. Users gain control of
@@ -21,7 +21,7 @@ ipywidgets to your notebooks, and we're here to help you get started.
2121
## Core Interactive Widgets
2222

2323
The fundamental widgets provided by this library are called core interactive
24-
widgets. A [demonstration notebook](https://github.com/jupyter-widgets/ipywidgets/blob/master/docs/source/examples/Index.ipynb)
24+
widgets. A [demonstration notebook](https://github.com/jupyter-widgets/ipywidgets/blob/main/docs/source/examples/Index.ipynb)
2525
provides an overview of the core interactive widgets, including:
2626

2727
- sliders
@@ -87,14 +87,14 @@ see the detailed [developer install](docs/source/dev_install.md) instructions.
8787

8888
If you want to install ipywidgets from source, **you will need the
8989
[yarn](https://yarnpkg.com/) package manager version 1.2.1 or later**.
90-
To install the latest master version from the root directory of the source
90+
To install the latest `main` version from the root directory of the source
9191
code, run `dev-install.sh`. To only build the Python package enter
9292
`pip install -e .`.
9393

9494
## Usage
9595

9696
See the [examples](docs/source/examples.md) section of the documentation. The widgets are being used in a variety of ways; some uses can be seen in these notebooks:
97-
[Demo notebook of interactive widgets](https://github.com/jupyter-widgets/ipywidgets/blob/master/docs/source/examples/Index.ipynb)
97+
[Demo notebook of interactive widgets](https://github.com/jupyter-widgets/ipywidgets/blob/main/docs/source/examples/Index.ipynb)
9898

9999
## Change log
100100

@@ -106,13 +106,13 @@ Refer to change log for more detail.
106106

107107
| ipywidgets | JupyterLab | [Classic Notebook](https://github.com/jupyter/notebook) | [nbclassic](https://github.com/jupyterlab/nbclassic) |
108108
| ---------- | :--------: | :-----------------------------------------------------: | :--------------------------------------------------: |
109-
| master | | - | TBD |
110-
| 7.6.3 | | | 0.2.6 |
109+
| `main` | | - | TBD |
110+
| `7.6.3` | | | 0.2.6 |
111111
| **Legacy** | | | |
112-
| 6.x | | | - |
113-
| 5.x | | 4.2 | - |
114-
| 4.1.x | | 4.1 | - |
115-
| 4.0.x | | 4.0 | - |
112+
| `6.x` | | | - |
113+
| `5.x` | | 4.2 | - |
114+
| `4.1.x` | | 4.1 | - |
115+
| `4.0.x` | | 4.0 | - |
116116

117117
## Contributing to ipywidgets
118118

docs/source/changelog.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ If you are developing a custom widget or widget manager, here are some major cha
447447
- A custom serializer is given the widget instance as its second argument, and a custom deserializer is given the widget manager as its second argument.
448448
- The Javascript model `.id` attribute has been renamed to `.model_id` to avoid conflicting with the Backbone `.id` attribute. ([#1410](https://github.com/jupyter-widgets/ipywidgets/pull/1410))
449449
- Regarding widget managers and the syncing message protocol:
450-
- The widget protocol was significantly overhauled. The new widget messaging protocol (version 2) is specified in the [version 2 protocol documentation](https://github.com/jupyter-widgets/ipywidgets/blob/master/jupyter-widgets-schema/messages.md).
450+
- The widget protocol was significantly overhauled. The new widget messaging protocol (version 2) is specified in the [version 2 protocol documentation](https://github.com/jupyter-widgets/ipywidgets/blob/main/jupyter-widgets-schema/messages.md).
451451
- Widgets are now displayed with a `display_data` message instead of with a custom comm message. See the [ipywidgets](https://github.com/jupyter-widgets/ipywidgets/blob/20cd0f050090b1b19bb9657b8c3fa42ae384cfca/ipywidgets/widgets/widget.py#L656) implementation for an example. ([#1274](https://github.com/jupyter-widgets/ipywidgets/pull/1274))
452452
- Custom widget managers are now responsible completely for loading widget model and view classes. Widget managers should provide an output model and view class appropriate for their environment so that the `Output` widget works. ([#1313](https://github.com/jupyter-widgets/ipywidgets/pull/1313))
453453
- The widget manager `clear_state` method no longer has a `commlessOnly` argument. All models in the widget manager will be closed and cleared when `clear_state` is called. ([#1354](https://github.com/jupyter-widgets/ipywidgets/pull/1354))
@@ -459,7 +459,7 @@ Major user-visible changes in ipywidgets 6.0 include:
459459
- Rendering of Jupyter interactive widgets in various web contexts
460460

461461
sphinx documentation: http://ipywidgets.readthedocs.io/en/latest/examples/Widget%20List.html
462-
nbviewer: http://nbviewer.jupyter.org/github/jupyter-widgets/ipywidgets/blob/master/docs/source/examples/Widget%20List.ipynb
462+
nbviewer: http://nbviewer.jupyter.org/github/jupyter-widgets/ipywidgets/blob/main/docs/source/examples/Widget%20List.ipynb
463463
Static web pages: http://jupyter.org/widgets
464464

465465
- Addition of a DatePicker widget in the core widget collection.

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ def setup(app):
178178
"doc_path": "docs",
179179
"github_repo": "ipywidgets",
180180
"github_user": "jupyter-widgets",
181-
"github_version": "master",
181+
"github_version": "main",
182182
}
183183

184184
html_sidebars = {

docs/source/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
We appreciate contributions from the community.
44

5-
We follow the [IPython Contributing Guide](https://github.com/ipython/ipython/blob/master/CONTRIBUTING.md)
5+
We follow the [IPython Contributing Guide](https://github.com/ipython/ipython/blob/main/CONTRIBUTING.md)
66
and [Jupyter Contributing Guides](https://jupyter.readthedocs.io/en/latest/contributor/content-contributor.html).

docs/source/dev_install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To install ipywidgets from git, you will need:
1212
- the latest [Jupyter Notebook development release](https://github.com/jupyter/notebook/releases)
1313

1414
- Everything in the ipywidgets repository is developed using Jupyter
15-
notebook's master branch.
15+
notebook's `main` branch.
1616
- If you want to have a copy of ipywidgets that works against a stable
1717
version of the notebook, checkout the appropriate tag.
1818
- See the

docs/source/dev_release.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Developer Release Procedure
22

33
To release a new version of the widgets on PyPI and npm, first checkout the
4-
`master` branch and `cd` into the repo root.
4+
`main` branch and `cd` into the repo root.
55

66
```
77
cd release
@@ -43,9 +43,9 @@ Commit the changes (don't forget to `git add` the new model spec file).
4343

4444
```
4545
# clean out all dirty files
46-
git checkout master
47-
git pull origin master
48-
git reset --hard origin/master
46+
git checkout main
47+
git pull origin main
48+
git reset --hard origin/main
4949
git clean -fdx
5050
yarn install
5151
yarn version
@@ -121,11 +121,11 @@ Using the above script, you can do:
121121
./scripts/hashes python/jupyterlab_widgets/dist/*
122122
```
123123

124-
Commit the changes you've made above, and include the uploaded files hashes in the commit message. Tag the release if ipywidgets was released. Push to origin master (and include the tag in the push), e.g:
124+
Commit the changes you've made above, and include the uploaded files hashes in the commit message. Tag the release if ipywidgets was released. Push to origin `main` (and include the tag in the push), e.g:
125125

126126
```
127127
git tag 8.0.4
128-
git push origin master 8.0.4
128+
git push origin main 8.0.4
129129
```
130130

131131
Update conda-forge packages (if the requirements changed to ipywidgets, make sure to update widgetsnbextension first).
@@ -150,7 +150,7 @@ Here are some commands used to generate some of the statistics above.
150150

151151
```
152152
# merges since in 6.0.0, but not 7.0.0, which is a rough list of merged PRs
153-
git log --merges 6.0.0...master --pretty=oneline
153+
git log --merges 6.0.0...main --pretty=oneline
154154
155155
# To really make sure we get all PRs, we could write a program that
156156
# pulled all of the PRs, examined a commit in each one, and did
@@ -164,11 +164,11 @@ git log --merges 6.0.0...master --pretty=oneline
164164
git show -s --format=%cd --date=short 6.0.0^{commit}
165165
166166
# Non-merge commits in 7.0.0 not in any 6.x release
167-
git log --pretty=oneline --no-merges ^6.0.0 master | wc -l
167+
git log --pretty=oneline --no-merges ^6.0.0 main | wc -l
168168
169169
# Authors of non-merge commits
170-
git shortlog -s 6.0.0..master --no-merges | cut -c8- | sort -f
170+
git shortlog -s 6.0.0..main --no-merges | cut -c8- | sort -f
171171
172172
# New committers: authors unique in the 6.0.0..7.0.0 logs, but not in the 6.0.0 log
173-
comm -23 <(git shortlog -s -n 6.0.0..master --no-merges | cut -c8- | sort) <(git shortlog -s -n 6.0.0 --no-merges | cut -c8- | sort) | sort -f
173+
comm -23 <(git shortlog -s -n 6.0.0..main --no-merges | cut -c8- | sort) <(git shortlog -s -n 6.0.0 --no-merges | cut -c8- | sort) | sort -f
174174
```

0 commit comments

Comments
 (0)