From 9ed111cf51f32361f47280708a9011b4326b4355 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Fri, 18 Aug 2023 07:42:32 -0500 Subject: [PATCH] use default branch main (#71) --- .github/workflows/ci.yml | 4 ++-- CONTRIBUTING.md | 2 +- README.md | 12 ++++++------ packages/jupyterlab-font-anonymous-pro/README.md | 2 +- packages/jupyterlab-font-dejavu-sans-mono/README.md | 2 +- packages/jupyterlab-font-fira-code/README.md | 2 +- packages/jupyterlab-fonts/README.md | 2 +- setup.py | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07a52490..316b015f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,10 +3,10 @@ name: CI on: push: branches: - - master + - main pull_request: branches: - - master + - main env: PIP_DISABLE_PIP_VERSION_CHECK: 1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 02a69273..ff48e0f8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,7 +55,7 @@ doit lint - ensure the CHANGELOG is updated - wait for CI - download the dist -- make a GitHub release off `master` +- make a GitHub release off `main` - upload the assets - upload to PyPI, npm - handle conda-forge chores diff --git a/README.md b/README.md index acbb2380..ee039bc0 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,12 @@ [![ci-badge]][ci] [![demo-badge]][demo] [ci]: - https://github.com/deathbeds/jupyterlab-fonts/actions?query=branch%3Amaster + https://github.com/deathbeds/jupyterlab-fonts/actions?query=branch%3Amain 'current build status of jupyterlab-fonts' [ci-badge]: https://github.com/deathbeds/jupyterlab-fonts/actions/workflows/ci.yml/badge.svg [demo]: - https://mybinder.org/v2/gh/deathbeds/jupyterlab-fonts/master?urlpath=lab + https://mybinder.org/v2/gh/deathbeds/jupyterlab-fonts/main?urlpath=lab 'an interactive demo of jupyterlab-fonts' [demo-badge]: https://mybinder.org/badge_logo.svg @@ -28,13 +28,13 @@ > time-permitting basis. [license]: - https://github.com/deathbeds/jupyterlab-fonts/blob/master/LICENSE + https://github.com/deathbeds/jupyterlab-fonts/blob/main/LICENSE 'BSD-3-Clause' [contributing]: - https://github.com/deathbeds/jupyterlab-fonts/blob/master/CONTRIBUTING.md + https://github.com/deathbeds/jupyterlab-fonts/blob/main/CONTRIBUTING.md 'contribute to jupyterlab-fonts' [changelog]: - https://github.com/deathbeds/jupyterlab-fonts/blob/master/CHANGELOG.md + https://github.com/deathbeds/jupyterlab-fonts/blob/main/CHANGELOG.md 'the history of jupyterlab-fonts' [pr]: https://github.com/deathbeds/jupyterlab-fonts/pulls @@ -97,7 +97,7 @@ changes, and its license information will be stored in the Notebook metadata. > use in collaboration. We're looking into some alterate approaches. [fonts-icon]: - https://raw.githubusercontent.com/deathbeds/jupyterlab-fonts/master/packages/jupyterlab-fonts/style/icons/fonts.svg + https://raw.githubusercontent.com/deathbeds/jupyterlab-fonts/main/packages/jupyterlab-fonts/style/icons/fonts.svg ### Advanced Configuration diff --git a/packages/jupyterlab-font-anonymous-pro/README.md b/packages/jupyterlab-font-anonymous-pro/README.md index 73472b32..a91c541d 100644 --- a/packages/jupyterlab-font-anonymous-pro/README.md +++ b/packages/jupyterlab-font-anonymous-pro/README.md @@ -11,4 +11,4 @@ conda install -c conda-forge jupyterlab-fonts ``` For more information, see the -[contribution guide](https://github.com/deathbeds/jupyterlab-fonts/blob/master/CONTRIBUTING.md). +[contribution guide](https://github.com/deathbeds/jupyterlab-fonts/blob/main/CONTRIBUTING.md). diff --git a/packages/jupyterlab-font-dejavu-sans-mono/README.md b/packages/jupyterlab-font-dejavu-sans-mono/README.md index 4e444465..1eacdf17 100644 --- a/packages/jupyterlab-font-dejavu-sans-mono/README.md +++ b/packages/jupyterlab-font-dejavu-sans-mono/README.md @@ -11,4 +11,4 @@ conda install -c conda-forge jupyterlab-fonts ``` For more information, see the -[contribution guide](https://github.com/deathbeds/jupyterlab-fonts/blob/master/CONTRIBUTING.md). +[contribution guide](https://github.com/deathbeds/jupyterlab-fonts/blob/main/CONTRIBUTING.md). diff --git a/packages/jupyterlab-font-fira-code/README.md b/packages/jupyterlab-font-fira-code/README.md index 73472b32..a91c541d 100644 --- a/packages/jupyterlab-font-fira-code/README.md +++ b/packages/jupyterlab-font-fira-code/README.md @@ -11,4 +11,4 @@ conda install -c conda-forge jupyterlab-fonts ``` For more information, see the -[contribution guide](https://github.com/deathbeds/jupyterlab-fonts/blob/master/CONTRIBUTING.md). +[contribution guide](https://github.com/deathbeds/jupyterlab-fonts/blob/main/CONTRIBUTING.md). diff --git a/packages/jupyterlab-fonts/README.md b/packages/jupyterlab-fonts/README.md index 3b077c75..7d48513e 100644 --- a/packages/jupyterlab-fonts/README.md +++ b/packages/jupyterlab-fonts/README.md @@ -11,4 +11,4 @@ conda install -c conda-forge jupyterlab-fonts ``` For more information, see the -[contribution guide](https://github.com/deathbeds/jupyterlab-fonts/blob/master/CONTRIBUTING.md). +[contribution guide](https://github.com/deathbeds/jupyterlab-fonts/blob/main/CONTRIBUTING.md). diff --git a/setup.py b/setup.py index 3bed3f4e..524ec39d 100644 --- a/setup.py +++ b/setup.py @@ -44,6 +44,6 @@ project_urls={ "Bug Tracker": __js__["bugs"]["url"], "Source Code": __js__["repository"]["url"], - "Changelog": f"""{__js__["repository"]["url"]}/blob/master/CHANGELOG.md""", + "Changelog": f"""{__js__["repository"]["url"]}/blob/main/CHANGELOG.md""", }, )