master -> main

Author: Carreau

.github/workflows/check-release.yml

@@ -1,7 +1,7 @@
 name: Check Release
 on:
   push:
-    branches: ["master", "*"]
+    branches: ["main", "*"]
   pull_request:
     branches: ["*"]
 

.github/workflows/tests.yml

@@ -2,7 +2,7 @@ name: Test
 
 on:
   push:
-    branches: master
+    branches: main
   pull_request:
 
 jobs:

README.md

@@ -9,7 +9,7 @@
 # [nbdime](https://github.com/jupyter/nbdime) Jupyter Notebook Diff and Merge tools
 
 [![Test](https://github.com/jupyter/nbdime/actions/workflows/tests.yml/badge.svg)](https://github.com/jupyter/nbdime/actions/workflows/tests.yml)
-[![codecov.io](https://codecov.io/github/jupyter/nbdime/coverage.svg?branch=master)](https://codecov.io/github/jupyter/nbdime?branch=master)
+[![codecov.io](https://codecov.io/github/jupyter/nbdime/coverage.svg?branch=main)](https://codecov.io/github/jupyter/nbdime?branch=main)
 [![Documentation Status](https://readthedocs.org/projects/nbdime/badge/?version=latest)](http://nbdime.readthedocs.io/en/latest/?badge=latest)
 [![Google Group](https://img.shields.io/badge/-Google%20Group-lightgrey.svg)](https://groups.google.com/forum/#!forum/jupyter)
 

docs/source/diffing.rst

@@ -34,7 +34,7 @@ The diff objects in nbdime are:
 The difference between these input objects is represented by a
 json-compatible results object. A JSON schema for validating diff
 entries is available in
-`diff_format.schema.json <https://github.com/jupyter/nbdime/blob/master/nbdime/diff_format.schema.json>`_.
+`diff_format.schema.json <https://github.com/jupyter/nbdime/blob/main/nbdime/diff_format.schema.json>`_.
 
 Diff format for mappings
 ------------------------
@@ -115,4 +115,4 @@ function::
 Examples
 --------
 
-For examples of diffs using nbdime, see `test_patch.py <https://github.com/jupyter/nbdime/blob/master/nbdime/tests/test_patch.py>`_.
+For examples of diffs using nbdime, see `test_patch.py <https://github.com/jupyter/nbdime/blob/main/nbdime/tests/test_patch.py>`_.

docs/source/testing.rst

@@ -4,7 +4,7 @@ Testing
 See the latest automated build, test, and coverage status at:
 
     - `Build and test on Travis <https://travis-ci.org/jupyter/nbdime>`_
-    - `Coverage on codecov <https://codecov.io/github/jupyter/nbdime?branch=master>`_
+    - `Coverage on codecov <https://codecov.io/github/jupyter/nbdime?branch=main>`_
 
 Dependencies
 ------------

nbdime/tests/conftest.py

@@ -89,7 +89,7 @@ def git_repo(tmpdir, request, filespath, needs_git, slow):
     save_cwd = os.getcwd()
     os.chdir(repo)
     request.addfinalizer(lambda: os.chdir(save_cwd))
-    call('git init -b master'.split())
+    call('git init -b main'.split())
 
     # setup base branch
     src = filespath
@@ -98,23 +98,23 @@ def git_repo(tmpdir, request, filespath, needs_git, slow):
     shutil.copy(pjoin(src, 'src-and-output--1.ipynb'), pjoin(repo, 'diff.ipynb'))
     call('git add *.ipynb')
     call('git commit -m "init base branch"')
-    # create base alias for master
-    call('git checkout -b base master')
+    # create base alias for main
+    call('git checkout -b base main')
 
     # setup local branch
-    call('git checkout -b local master')
+    call('git checkout -b local main')
     shutil.copy(pjoin(src, 'multilevel-test-local.ipynb'), pjoin(repo, 'merge-no-conflict.ipynb'))
     shutil.copy(pjoin(src, 'inline-conflict--2.ipynb'), pjoin(repo, 'merge-conflict.ipynb'))
     shutil.copy(pjoin(src, 'src-and-output--2.ipynb'), pjoin(repo, 'diff.ipynb'))
     call('git commit -am "create local branch"')
 
     # setup remote branch with conflict
-    call('git checkout -b remote-conflict master')
+    call('git checkout -b remote-conflict main')
     shutil.copy(pjoin(src, 'inline-conflict--3.ipynb'), pjoin(repo, 'merge-conflict.ipynb'))
     call('git commit -am "create remote with conflict"')
 
     # setup remote branch with no conflict
-    call('git checkout -b remote-no-conflict master')
+    call('git checkout -b remote-no-conflict main')
     shutil.copy(pjoin(src, 'multilevel-test-remote.ipynb'), pjoin(repo, 'merge-no-conflict.ipynb'))
     call('git commit -am "create remote with no conflict"')
 
@@ -131,7 +131,7 @@ def git_repo2(tmpdir, request, filespath, needs_git, slow):
     save_cwd = os.getcwd()
     os.chdir(repo)
     request.addfinalizer(lambda: os.chdir(save_cwd))
-    call('git init -b master'.split())
+    call('git init -b main'.split())
 
     # setup base branch
     src = filespath
@@ -140,17 +140,17 @@ def git_repo2(tmpdir, request, filespath, needs_git, slow):
     shutil.copy(pjoin(src, 'foo--1.ipynb'), pjoin(repo, 'sub', 'subfile.ipynb'))
     call('git add --all')
     call('git commit -m "init base branch"')
-    # create base alias for master
-    call('git checkout -b base master')
+    # create base alias for main
+    call('git checkout -b base main')
 
     # setup local branch
-    call('git checkout -b local master')
+    call('git checkout -b local main')
     shutil.copy(pjoin(src, 'src-and-output--2.ipynb'), pjoin(repo, 'diff.ipynb'))
     shutil.copy(pjoin(src, 'foo--2.ipynb'), pjoin(repo, 'sub', 'subfile.ipynb'))
     call('git commit -am "create local branch"')
 
     # setup remote branch
-    call('git checkout -b remote master')
+    call('git checkout -b remote main')
     shutil.copy(pjoin(src, 'foo--2.ipynb'), pjoin(repo, 'sub', 'subfile.ipynb'))
     shutil.copy(pjoin(src, 'markdown-only--1.ipynb'), pjoin(repo, 'sub', 'added.ipynb'))
     call('git add --all')