Skip to content

Commit

Permalink
Rename master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
consideRatio committed Oct 22, 2021
1 parent 3044410 commit e3f01a6
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ For small changes (like typos) you do not need to setup anything locally. For
larger changes we recommend you build the documentation locally so you can see
the end product in its full glory.

To make edits through the GitHub website visit https://github.com/jupyterhub/kubespawner/tree/master/docs/source, open the file you would like to edit and then click "edit". GitHub will
To make edits through the GitHub website visit https://github.com/jupyterhub/kubespawner/tree/HEAD/docs/source, open the file you would like to edit and then click "edit". GitHub will
walk you through the process of proposing your change ("making a Pull Request").

A brief guide to setting up for local development
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Documentation status](https://img.shields.io/readthedocs/jupyterhub-kubespawner?logo=read-the-docs)](https://jupyterhub-kubespawner.readthedocs.io/en/latest/?badge=latest)
[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/jupyterhub/kubespawner/Test?logo=github)](https://github.com/jupyterhub/kubespawner/actions)
[![Code coverage](https://codecov.io/gh/jupyterhub/kubespawner/branch/master/graph/badge.svg)](https://codecov.io/gh/jupyterhub/kubespawner)
[![Code coverage](https://codecov.io/gh/jupyterhub/kubespawner/branch/main/graph/badge.svg)](https://codecov.io/gh/jupyterhub/kubespawner)
[![](https://img.shields.io/pypi/v/jupyterhub-kubespawner.svg?logo=pypi)](https://pypi.python.org/pypi/jupyterhub-kubespawner)

The _kubespawner_ (also known as JupyterHub Kubernetes Spawner) enables JupyterHub to spawn
Expand Down
18 changes: 9 additions & 9 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ For you to follow along according to these instructions, you need:
github-activity jupyterhub/kubespawner --output tmp-changelog-prep.md
```

1. Once the changelog is up to date, checkout master and make sure it is up to date and clean.
1. Once the changelog is up to date, checkout main and make sure it is up to date and clean.

```bash
ORIGIN=${ORIGIN:-origin} # set to the canonical remote, e.g. 'upstream' if 'origin' is not the official repo
git checkout master
git fetch $ORIGIN master
git reset --hard $ORIGIN/master
git checkout main
git fetch $ORIGIN main
git reset --hard $ORIGIN/main
# WARNING! This next command deletes any untracked files in the repo
git clean -xfd
```
Expand All @@ -42,20 +42,20 @@ For you to follow along according to these instructions, you need:
git log
```

1. Push your two commits to master along with the annotated tags referencing
commits on master. TravisCI will trigger automatic deployment of the pushed
tag.
1. Push your two commits to main along with the annotated tags referencing
commits on main. A GitHub workflow will trigger on the pushed git tag and
publish to PyPI.

```bash
# pushing the commits standalone allows you to
# ensure you don't end up only pushing the tag
# because the commit were rejected but the tag
# wasn't
git push $ORIGIN master
git push $ORIGIN main

# if you could push the commits without issues
# go ahead and push the tag also
git push --follow-tags $ORIGIN master
git push --follow-tags $ORIGIN main
```

1. Verify that [the GitHub
Expand Down
10 changes: 5 additions & 5 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
# source_suffix = ['.rst', '.md']
source_suffix = ['.rst', '.md']

# The master toctree document.
master_doc = 'index'
# The root toctree document.
root_doc = master_doc = 'index'

# General information about the project.
project = 'kubespawner'
Expand Down Expand Up @@ -147,7 +147,7 @@
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(
master_doc,
root_doc,
'Kubespawner.tex',
'Kubespawner Documentation',
'Project Jupyter',
Expand All @@ -160,7 +160,7 @@

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [(master_doc, 'kubespawner', 'Kubespawner Documentation', [author], 1)]
man_pages = [(root_doc, 'kubespawner', 'Kubespawner Documentation', [author], 1)]


# -- Options for Texinfo output -------------------------------------------
Expand All @@ -170,7 +170,7 @@
# dir menu entry, description, category)
texinfo_documents = [
(
master_doc,
root_doc,
'Kubespawner',
'Kubespawner Documentation',
author,
Expand Down
2 changes: 1 addition & 1 deletion kubespawner/spawner.py
Original file line number Diff line number Diff line change
Expand Up @@ -1734,7 +1734,7 @@ def _expand_all(self, src):

def _build_common_labels(self, extra_labels):
# Default set of labels, picked up from
# https://github.com/kubernetes/helm/blob/master/docs/chart_best_practices/labels.md
# https://github.com/helm/helm-www/blob/HEAD/content/en/docs/chart_best_practices/labels.md
labels = {
'hub.jupyter.org/username': escapism.escape(
self.user.name, safe=self.safe_chars, escape_char='-'
Expand Down

0 comments on commit e3f01a6

Please sign in to comment.