Skip to content

Update references to master branch #5036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ below :-).
### Documentation PR
- [ ] I've [seen the `doc/README.md` file](https://github.com/plotly/plotly.py/blob/master/doc/README.md)
- [ ] This change runs in the current version of Plotly on PyPI and targets the `doc-prod` branch OR it targets the `master` branch
- [ ] This change runs in the current version of Plotly on PyPI and targets the `doc-prod` branch OR it targets the `main` branch
- [ ] If this PR modifies the first example in a page or adds a new one, it is a `px` example if at all possible
- [ ] Every new/modified example has a descriptive title and motivating sentence or paragraph
- [ ] Every new/modified example is independently runnable
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ a PR as follows.

### Making a Development Branch

Third, *don't* work in the `master` branch. As soon as you get your master branch ready, run:
Third, *don't* work in the `main` branch. As soon as you get your main branch ready, run:

**DO THIS (but change the branch name)**
```bash
Expand Down
8 changes: 4 additions & 4 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Manually update the versions to `X.Y.Z` in the files specified below.
- Create a tag for Github release
+ `git tag vX.Y.Z`
+ `git push --atomic origin release-X.Y.Z vX.Y.Z`
- Create a Github pull request from `release-X.Y.Z` to `master` and wait for CI to be green
- Create a Github pull request from `release-X.Y.Z` to `main` and wait for CI to be green

### Download and QA CI Artifacts

Expand Down Expand Up @@ -62,7 +62,7 @@ Publishing to PyPI:

### Merge the PR and make a Release

1. Merge the pull request you created above into `master`
1. Merge the pull request you created above into `main`
2. Go to https://github.com/plotly/plotly.py/releases and "Draft a new release"
3. Enter the `vX.Y.Z` tag you created already above and make "Release title" the same string as the tag.
4. Copy the changelog section for this version as the "Describe this release"
Expand All @@ -73,8 +73,8 @@ Publishing to PyPI:
- `doc/python/getting-started.md`
- `doc/apidoc/conf.py`
- `doc/requirements.txt`
2. `doc-prod` should already have been merged on a regular basis into `master`, but
start by doing it first if not. Then merge `master` into `doc-prod` to deploy the doc related
2. `doc-prod` should already have been merged on a regular basis into `main`, but
start by doing it first if not. Then merge `main` into `doc-prod` to deploy the doc related
to features in the release.
3. in a clone of the [`graphing-library-docs` repo](https://github.com/plotly/graphing-library-docs):
1. bump the version of Plotly.py in `_data/pyversion.json`
Expand Down
2 changes: 1 addition & 1 deletion doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ released, or which has just been included but not yet released.
your branch off the `doc-prod` branch and open your pull request against this
`doc-prod` branch.
- Case of a new (not released yet) feature: start your branch / pull request
against the `master` branch. `master` and `doc-prod` will be synchronized at
against the `main` branch. `main` and `doc-prod` will be synchronized at
release time, so that the documentation of the feature is only deployed when
it is available in a released version of `plotly.py`.

Expand Down