Skip to content

Commit 3e78339

Browse files
authored
Update branch references (#646)
1 parent 6ff80c5 commit 3e78339

File tree

11 files changed

+15
-15
lines changed

11 files changed

+15
-15
lines changed

.github/workflows/check-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Check Release
22
on:
33
push:
4-
branches: ["master"]
4+
branches: ["main"]
55
pull_request:
66
branches: ["*"]
77

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ name: "CodeQL"
1414

1515
on:
1616
push:
17-
branches: ["master"]
17+
branches: ["main"]
1818
pull_request:
1919
# The branches below must be a subset of the branches above
20-
branches: [master]
20+
branches: ["main"]
2121
schedule:
2222
- cron: "25 18 * * 4"
2323

.github/workflows/integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Jupyter Server Integration Tests [Linux]
22
on:
33
push:
4-
branches: "master"
4+
branches: "main"
55
pull_request:
66
branches: "*"
77
jobs:

.github/workflows/python-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Jupyter Server Tests [Linux]
22
on:
33
push:
4-
branches: "master"
4+
branches: "main"
55
pull_request:
66
branches: "*"
77
jobs:

.github/workflows/python-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Jupyter Server Tests [Mac OS]
22
on:
33
push:
4-
branches: "master"
4+
branches: "main"
55
pull_request:
66
branches: "*"
77
jobs:

.github/workflows/python-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Jupyter Server Tests [Windows]
22
on:
33
push:
4-
branches: "master"
4+
branches: "main"
55
pull_request:
66
branches: "*"
77
jobs:

CONTRIBUTING.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ steps::
3232
If you are using a system-wide Python installation and you only want to install the server for you,
3333
you can add ``--user`` to the install commands.
3434

35-
Once you have done this, you can launch the master branch of Jupyter server
35+
Once you have done this, you can launch the main branch of Jupyter server
3636
from any directory in your system with::
3737

3838
jupyter server

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Jupyter Server
22

3-
[![Build Status](https://github.com/jupyter/jupyter_server/workflows/CI/badge.svg?query=branch%3Amaster++)](https://github.com/jupyter-server/jupyter_server/actions?query=branch%3Amaster++)
3+
[![Build Status](https://github.com/jupyter/jupyter_server/workflows/CI/badge.svg?query=branch%3Amain++)](https://github.com/jupyter-server/jupyter_server/actions?query=branch%3Amain++)
44
[![Documentation Status](https://readthedocs.org/projects/jupyter-server/badge/?version=latest)](http://jupyter-server.readthedocs.io/en/latest/?badge=latest)
55

66
The Jupyter Server provides the backend (i.e. the core services, APIs, and REST endpoints) for Jupyter web applications like Jupyter notebook, JupyterLab, and Voila.
@@ -20,9 +20,9 @@ Jupyter Server currently supports Python>=3.6 on Linux, OSX and Windows.
2020

2121
If Jupyter Server is a dependency of your project/application, it is important that you pin it to a version that works for your application. Currently, Jupyter Server only has minor and patch versions. Different minor versions likely include API-changes while patch versions do not change API.
2222

23-
When a new minor version is released on PyPI, a branch for that version will be created in this repository, and the version of the master branch will be bumped to the next minor version number. That way, the master branch always reflects the latest un-released version.
23+
When a new minor version is released on PyPI, a branch for that version will be created in this repository, and the version of the main branch will be bumped to the next minor version number. That way, the main branch always reflects the latest un-released version.
2424

25-
To see the changes between releases, checkout the [CHANGELOG](https://github.com/jupyter/jupyter_server/blob/master/CHANGELOG.md).
25+
To see the changes between releases, checkout the [CHANGELOG](https://github.com/jupyter/jupyter_server/blob/main/CHANGELOG.md).
2626

2727
## Usage - Running Jupyter Server
2828

@@ -34,7 +34,7 @@ Launch with:
3434

3535
### Testing
3636

37-
See [CONTRIBUTING](https://github.com/jupyter-server/jupyter_server/blob/master/CONTRIBUTING.rst#running-tests).
37+
See [CONTRIBUTING](https://github.com/jupyter-server/jupyter_server/blob/main/CONTRIBUTING.rst#running-tests).
3838

3939
## Contributing
4040

docs/source/developers/extensions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Server Extensions
55
A Jupyter Server extension is typically a module or package that extends to Server’s REST API/endpoints—i.e. adds extra request handlers to Server’s Tornado Web Application.
66

77
You can check some simple examples on the `examples folder
8-
<https://github.com/jupyter/jupyter_server/tree/master/examples/simple>`_ in the GitHub jupyter_server repository.
8+
<https://github.com/jupyter/jupyter_server/tree/main/examples/simple>`_ in the GitHub jupyter_server repository.
99

1010
Authoring a basic server extension
1111
==================================

docs/source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Jupyter Server is the backend—the core services, APIs, and `REST endpoints`_
1919

2020
.. _Tornado: https://www.tornadoweb.org/en/stable/
2121
.. _Jupyter Notebook: https://github.com/jupyter/notebook
22-
.. _REST endpoints: https://petstore.swagger.io/?url=https://raw.githubusercontent.com/jupyter/jupyter_server/master/jupyter_server/services/api/api.yaml
22+
.. _REST endpoints: https://petstore.swagger.io/?url=https://raw.githubusercontent.com/jupyter/jupyter_server/main/jupyter_server/services/api/api.yaml
2323

2424
Who's this for?
2525
---------------

0 commit comments

Comments
 (0)