Skip to content

Commit 3e4b459

Browse files
authored
code changes for changing the name of the "master" branch to "main" (#1122)
* update github python package.yml * update the README * update contributing and architecture links
1 parent 0aa7765 commit 3e4b459

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

.github/workflows/python-package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ env:
1111

1212
on:
1313
push:
14-
branches: [ master ]
14+
branches: [ main ]
1515
pull_request:
16-
branches: [ master ]
16+
branches: [ main ]
1717

1818
jobs:
1919
cpp_build:

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ OpenTimelineIO
66
[![Supported VFX Platform Versions](https://img.shields.io/badge/vfx%20platform-2018--2021-lightgrey.svg)](http://www.vfxplatform.com/)
77
![Supported Versions](https://img.shields.io/badge/python-2.7%2C%203.7%2C%203.8%2C%203.9-blue)
88
[![Build Status](https://github.com/PixarAnimationStudios/OpenTimelineIO/actions/workflows/python-package.yml/badge.svg)](https://github.com/PixarAnimationStudios/OpenTimelineIO/actions/workflows/python-package.yml)
9-
[![codecov](https://codecov.io/gh/PixarAnimationStudios/OpenTimelineIO/branch/master/graph/badge.svg)](https://codecov.io/gh/PixarAnimationStudios/OpenTimelineIO)
9+
[![codecov](https://codecov.io/gh/PixarAnimationStudios/OpenTimelineIO/branch/main/graph/badge.svg)](https://codecov.io/gh/PixarAnimationStudios/OpenTimelineIO)
1010
[![docs](https://readthedocs.org/projects/opentimelineio/badge/?version=latest)](https://opentimelineio.readthedocs.io/en/latest/index.html)
1111

1212
Main web site: http://opentimeline.io/
@@ -96,10 +96,10 @@ for clip in timeline.each_clip():
9696
print(clip.name, clip.duration())
9797
```
9898

99-
There are more code examples here: https://github.com/PixarAnimationStudios/OpenTimelineIO/tree/master/examples
99+
There are more code examples here: https://github.com/PixarAnimationStudios/OpenTimelineIO/tree/main/examples
100100

101101
Also, looking through the unit tests is a great way to see what OTIO can do:
102-
https://github.com/PixarAnimationStudios/OpenTimelineIO/tree/master/tests
102+
https://github.com/PixarAnimationStudios/OpenTimelineIO/tree/main/tests
103103

104104
OTIO includes a viewer program as well (see the quickstart section for instructions on installing it):
105105

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
# The encoding of source files.
5151
# source_encoding = 'utf-8-sig'
5252

53-
# The master toctree document.
53+
# The main toctree document.
5454
master_doc = 'index'
5555

5656
# General information about the project.

docs/tutorials/architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,4 @@ For more information about writing media linkers, see <a href="write-a-media-lin
134134
Example Scripts
135135
----------------
136136

137-
Example scripts are located in the <a href="https://github.com/PixarAnimationStudios/OpenTimelineIO/tree/master/examples" target="_blank">examples subdirectory</a>.
137+
Example scripts are located in the <a href="https://github.com/PixarAnimationStudios/OpenTimelineIO/tree/main/examples" target="_blank">examples subdirectory</a>.

docs/tutorials/contributing.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ We're excited to collaborate with the community and look forward to the many imp
77

88
Before contributing code to OpenTimelineIO, we ask that you sign a Contributor License Agreement (CLA). At the root of the repo you can find the two possible CLAs:
99

10-
* [OTIO_CLA_Corporate.pdf](https://github.com/PixarAnimationStudios/OpenTimelineIO/raw/master/OTIO_CLA_Corporate.pdf): please sign this one for corporate use
11-
* [OTIO_CLA_Individual.pdf](https://github.com/PixarAnimationStudios/OpenTimelineIO/raw/master/OTIO_CLA_Individual.pdf): please sign this one if you're an individual contributor
10+
* [OTIO_CLA_Corporate.pdf](https://github.com/PixarAnimationStudios/OpenTimelineIO/raw/main/OTIO_CLA_Corporate.pdf): please sign this one for corporate use
11+
* [OTIO_CLA_Individual.pdf](https://github.com/PixarAnimationStudios/OpenTimelineIO/raw/main/OTIO_CLA_Individual.pdf): please sign this one if you're an individual contributor
1212

1313
Once your CLA is signed, send it to `[email protected]` (please make sure to include your github username) and wait for confirmation that we've received it. After that, you can submit pull requests.
1414

@@ -42,13 +42,13 @@ Now you fetch the latest changes from Pixar's OpenTimelineIO repo like this:
4242

4343
```bash
4444
git fetch upstream
45-
git merge upstream/master
45+
git merge upstream/main
4646
```
4747

48-
All the development should happen against the `master` branch. We recommend you create a new branch for each feature or fix that you'd like to make and give it a descriptive name so that you can remember it later. You can checkout a new branch and create it simultaneously like this:
48+
All the development should happen against the `main` branch. We recommend you create a new branch for each feature or fix that you'd like to make and give it a descriptive name so that you can remember it later. You can checkout a new branch and create it simultaneously like this:
4949

5050
```bash
51-
git checkout -b mybugfix upstream/master
51+
git checkout -b mybugfix upstream/main
5252
```
5353

5454
Now you can work in your branch locally.
@@ -66,6 +66,6 @@ If all the tests pass and you'd like to send your change in for consideration, p
6666
git push origin mybugfix
6767
```
6868

69-
Now your remote branch will have your `mybugfix` branch, which you can now pull request (to OpenTimelineIO's `master` branch) using the github UI.
69+
Now your remote branch will have your `mybugfix` branch, which you can now pull request (to OpenTimelineIO's `main` branch) using the github UI.
7070

7171
Please make sure that your pull requests are clean. Use the rebase and squash git facilities as needed to ensure that the pull request is as clean as possible.

0 commit comments

Comments
 (0)