Skip to content

Commit

Permalink
Update branch references and links (jupyter-server#791)
Browse files Browse the repository at this point in the history
  • Loading branch information
blink1073 authored Apr 20, 2022
1 parent 64555ff commit e1720c8
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 13 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/check-release.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: Check Release
on:
push:
branches: ["main"]
branches: ["1.x"]
pull_request:
branches: ["*"]

jobs:
check_release:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Jupyter Server Integration Tests [Linux]
on:
push:
branches: ["main"]
branches: ["1.x"]
pull_request:
branches: ["*"]

jobs:
build:
runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-tests.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Jupyter Server Tests
on:
push:
branches: ["main"]
branches: ["1.x"]
pull_request:
schedule:
- cron: "0 8 * * *"
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Jupyter Server

[![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++)
[![Documentation Status](https://readthedocs.org/projects/jupyter-server/badge/?version=latest)](http://jupyter-server.readthedocs.io/en/latest/?badge=latest)
[![Build Status](https://github.com/jupyter/jupyter_server/workflows/CI/badge.svg?query=branch%3A1.x++)](https://github.com/jupyter-server/jupyter_server/actions?query=branch%3A1.x++)
[![Documentation Status](https://readthedocs.org/projects/jupyter-server/badge/?version=stable)](http://jupyter-server.readthedocs.io/en/latest/?badge=stable)

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.

For more information, read our [documentation here](http://jupyter-server.readthedocs.io/en/latest/?badge=latest).
For more information, read our [documentation here](http://jupyter-server.readthedocs.io/en/stable/?badge=latest).

## Installation and Basic usage

Expand All @@ -22,7 +22,7 @@ If Jupyter Server is a dependency of your project/application, it is important t

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.

To see the changes between releases, checkout the [CHANGELOG](https://github.com/jupyter/jupyter_server/blob/main/CHANGELOG.md).
To see the changes between releases, checkout the [CHANGELOG](https://github.com/jupyter/jupyter_server/blob/1.x/CHANGELOG.md).

## Usage - Running Jupyter Server

Expand All @@ -34,7 +34,7 @@ Launch with:

### Testing

See [CONTRIBUTING](https://github.com/jupyter-server/jupyter_server/blob/main/CONTRIBUTING.rst#running-tests).
See [CONTRIBUTING](https://github.com/jupyter-server/jupyter_server/blob/1.x/CONTRIBUTING.rst#running-tests).

## Contributing

Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Jupyter Server Docs Sources

Read [this page](https://jupyter-server.readthedocs.io/en/latest/contributors/contributing.html#building-the-docs) to build the docs.
Read [this page](https://jupyter-server.readthedocs.io/en/stable/contributors/contributing.html#building-the-docs) to build the docs.
2 changes: 1 addition & 1 deletion docs/source/developers/extensions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Server Extensions
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.

You can check some simple examples on the `examples folder
<https://github.com/jupyter/jupyter_server/tree/main/examples/simple>`_ in the GitHub jupyter_server repository.
<https://github.com/jupyter/jupyter_server/tree/1.x/examples/simple>`_ in the GitHub jupyter_server repository.

Authoring a basic server extension
==================================
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Jupyter Server is the backend—the core services, APIs, and `REST endpoints`_

.. _Tornado: https://www.tornadoweb.org/en/stable/
.. _Jupyter Notebook: https://github.com/jupyter/notebook
.. _REST endpoints: https://petstore.swagger.io/?url=https://raw.githubusercontent.com/jupyter/jupyter_server/main/jupyter_server/services/api/api.yaml
.. _REST endpoints: https://petstore.swagger.io/?url=https://raw.githubusercontent.com/jupyter/jupyter_server/1.x/jupyter_server/services/api/api.yaml

Who's this for?
---------------
Expand Down

0 comments on commit e1720c8

Please sign in to comment.