Skip to content

Commit fb797a3

Browse files
authored
Remove uses of "master" (#13646)
1 parent 2acf014 commit fb797a3

21 files changed

+88
-98
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ For #
77

88
- [ ] Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR).
99
- [ ] Title summarizes what is changing.
10-
- [ ] Has a [news entry](https://github.com/Microsoft/vscode-python/tree/master/news) file (remember to thank yourself!).
10+
- [ ] Has a [news entry](https://github.com/Microsoft/vscode-python/tree/main/news) file (remember to thank yourself!).
1111
- [ ] Appropriate comments and documentation strings in the code.
1212
- [ ] Has sufficient logging.
1313
- [ ] Has telemetry for enhancements.
1414
- [ ] Unit tests & system/integration tests are added/updated.
15-
- [ ] [Test plan](https://github.com/Microsoft/vscode-python/blob/master/.github/test_plan.md) is updated as appropriate.
16-
- [ ] [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/master/package-lock.json) has been regenerated by running `npm install` (if dependencies have changed).
15+
- [ ] [Test plan](https://github.com/Microsoft/vscode-python/blob/main/.github/test_plan.md) is updated as appropriate.
16+
- [ ] [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/main/package-lock.json) has been regenerated by running `npm install` (if dependencies have changed).
1717
- [ ] The wiki is updated with any design decisions/details.

.github/release_plan.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,32 @@
66
# Release candidate (Monday, XXX XX)
77

88
- [ ] Announce the code freeze on both Teams and e-mail, leave enough time for teams to surface any last minute issues that need to get in before freeze. Make sure debugger and Language Server teams are looped in as well.
9-
- [ ] Update master for the release
10-
- [ ] Create a branch against `master` for a pull request
11-
- [ ] Change the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) from a `-dev` suffix to `-rc` (🤖)
12-
- [ ] Run `npm install` to make sure [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) is up-to-date (🤖)
9+
- [ ] Update `main` for the release
10+
- [ ] Create a branch against `main` for a pull request
11+
- [ ] Change the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) from a `-dev` suffix to `-rc` (🤖)
12+
- [ ] Run `npm install` to make sure [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) is up-to-date (🤖)
1313
- [ ] Extension will pick up latest version of `debugpy`. If you need to pin to a particular version see `install_debugpy.py`.
1414
- [ ] Update `languageServerVersion` in `package.json` to point to the latest version of the [Language Server](https://github.com/Microsoft/python-language-server). Check with the language server team if this needs updating.
15-
- [ ] Update [`CHANGELOG.md`](https://github.com/Microsoft/vscode-python/blob/master/CHANGELOG.md) (🤖)
16-
- [ ] Run [`news`](https://github.com/Microsoft/vscode-python/tree/master/news) (typically `python news --final --update CHANGELOG.md | code-insiders -`)
15+
- [ ] Update [`CHANGELOG.md`](https://github.com/Microsoft/vscode-python/blob/main/CHANGELOG.md) (🤖)
16+
- [ ] Run [`news`](https://github.com/Microsoft/vscode-python/tree/main/news) (typically `python news --final --update CHANGELOG.md | code-insiders -`)
1717
- [ ] Copy over the "Thanks" section from the previous release into the "Thanks" section for the new release
18-
- [ ] Make sure the "Thanks" section is up-to-date (e.g. compare to versions in [`requirements.txt`](https://github.com/microsoft/vscode-python/blob/master/requirements.txt))
18+
- [ ] Make sure the "Thanks" section is up-to-date (e.g. compare to versions in [`requirements.txt`](https://github.com/microsoft/vscode-python/blob/main/requirements.txt))
1919
- [ ] Touch up news entries (e.g. add missing periods)
2020
- [ ] Check the Markdown rendering to make sure everything looks good
2121
- [ ] Add any relevant news entries for `debugpy` and the language server if they were updated
22-
- [ ] Update [`ThirdPartyNotices-Distribution.txt`](https://github.com/Microsoft/vscode-python/blob/master/ThirdPartyNotices-Distribution.txt) by using https://tools.opensource.microsoft.com/notice (Notes for this process are in the Team OneNote under Python VS Code -> Dev Process -> Third-Party Notices / TPN file)
23-
- [ ] Update [`ThirdPartyNotices-Repository.txt`](https://github.com/Microsoft/vscode-python/blob/master/ThirdPartyNotices-Repository.txt) as appropriate. This file is manually edited so you can check with the teams if anything needs to be added here.
24-
- [ ] Create a pull request against `master` (🤖)
25-
- [ ] Merge pull request into `master`
22+
- [ ] Update [`ThirdPartyNotices-Distribution.txt`](https://github.com/Microsoft/vscode-python/blob/main/ThirdPartyNotices-Distribution.txt) by using https://tools.opensource.microsoft.com/notice (Notes for this process are in the Team OneNote under Python VS Code -> Dev Process -> Third-Party Notices / TPN file)
23+
- [ ] Update [`ThirdPartyNotices-Repository.txt`](https://github.com/Microsoft/vscode-python/blob/main/ThirdPartyNotices-Repository.txt) as appropriate. This file is manually edited so you can check with the teams if anything needs to be added here.
24+
- [ ] Create a pull request against `main` (🤖)
25+
- [ ] Merge pull request into `main`
2626
- [ ] Update the [`release` branch](https://github.com/microsoft/vscode-python/branches)
2727
- [ ] If there are `release` branches that are two versions old (e.g. release-2020.[current month - 2]) you can delete them at this time
28-
- [ ] Create a new `release-YYYY.MM` branch from `master`
29-
- [ ] Update master post-release (🤖)
30-
- [ ] Bump the version number to the next monthly ("YYYY.MM.0-dev") release in the `master` branch
28+
- [ ] Create a new `release-YYYY.MM` branch from `main`
29+
- [ ] Update `main` post-release (🤖)
30+
- [ ] Bump the version number to the next monthly ("YYYY.MM.0-dev") release in the `main` branch
3131
- [ ] `package.json`
3232
- [ ] `package-lock.json`
33-
- [ ] Create a pull request against `master`
34-
- [ ] Merge pull request into `master`
33+
- [ ] Create a pull request against `main`
34+
- [ ] Merge pull request into `main`
3535
- [ ] Announce the code freeze is over on the same channels
3636
- [ ] Update [Component Governance](https://dev.azure.com/ms/vscode-python/_componentGovernance) (Click on "microsoft/vscode-python" on that page). Notes are in the OneNote under Python VS Code -> Dev Process -> Component Governance.
3737
- [ ] Provide details for any automatically detected npm dependencies
@@ -52,22 +52,22 @@
5252
- [ ] Make sure the [appropriate pull requests](https://github.com/microsoft/vscode-docs/pulls) for the [documentation](https://code.visualstudio.com/docs/python/python-tutorial) -- including the [WOW](https://code.visualstudio.com/docs/languages/python) page -- are ready
5353
- [ ] Final updates to the `release-YYYY.MM` branch
5454
- [ ] Create a branch against `release-YYYY.MM` for a pull request
55-
- [ ] Update the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) to remove the `-rc` (🤖)
56-
- [ ] Run `npm install` to make sure [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) is up-to-date (the only update should be the version number if `package-lock.json` has been kept up-to-date) (🤖)
57-
- [ ] Update [`CHANGELOG.md`](https://github.com/Microsoft/vscode-python/blob/master/CHANGELOG.md) (🤖)
55+
- [ ] Update the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) to remove the `-rc` (🤖)
56+
- [ ] Run `npm install` to make sure [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) is up-to-date (the only update should be the version number if `package-lock.json` has been kept up-to-date) (🤖)
57+
- [ ] Update [`CHANGELOG.md`](https://github.com/Microsoft/vscode-python/blob/main/CHANGELOG.md) (🤖)
5858
- [ ] Update version and date for the release section
59-
- [ ] Run [`news`](https://github.com/Microsoft/vscode-python/tree/master/news) and copy-and-paste new entries (typically `python news --final | code-insiders -`; quite possibly nothing new to add)
60-
- [ ] Update [`ThirdPartyNotices-Distribution.txt`](https://github.com/Microsoft/vscode-python/blob/master/ThirdPartyNotices-Distribution.txt) by using https://tools.opensource.microsoft.com/notice (🤖; see team notes)
61-
- [ ] Update [`ThirdPartyNotices-Repository.txt`](https://github.com/Microsoft/vscode-python/blob/master/ThirdPartyNotices-Repository.txt) manually if necessary
59+
- [ ] Run [`news`](https://github.com/Microsoft/vscode-python/tree/main/news) and copy-and-paste new entries (typically `python news --final | code-insiders -`; quite possibly nothing new to add)
60+
- [ ] Update [`ThirdPartyNotices-Distribution.txt`](https://github.com/Microsoft/vscode-python/blob/main/ThirdPartyNotices-Distribution.txt) by using https://tools.opensource.microsoft.com/notice (🤖; see team notes)
61+
- [ ] Update [`ThirdPartyNotices-Repository.txt`](https://github.com/Microsoft/vscode-python/blob/main/ThirdPartyNotices-Repository.txt) manually if necessary
6262
- [ ] Create pull request against `release-YYYY.MM` (🤖)
6363
- [ ] Merge pull request into `release-YYYY.MM`
6464
- [ ] Make sure component governance is happy
6565

6666
## Release
6767

6868
- [ ] Publish the release via Azure DevOps
69-
- [ ] Make sure [CI](https://github.com/Microsoft/vscode-python/blob/master/CONTRIBUTING.md) is passing. Try a re-run on any failing CI test stages. If tests still won't pass contact the owning team.
70-
- [ ] On Azure DevOps on the page for the CI run after it succeeds there will now be a "Releases" tab which is populated with a release entry. Click that entry to go to the release page, which shows the "Upload" and "Publish" stages
69+
- [ ] Make sure [CI](https://github.com/Microsoft/vscode-python/blob/main/CONTRIBUTING.md) is passing. Try a re-run on any failing CI test stages. If tests still won't pass contact the owning team.
70+
- [ ] On Azure DevOps on the page for the CI run after it succeeds there will now be a "Releases" tab which is populated with a release entry. Click that entry to go to the release page, which shows the "Upload" and "Publish" stages
7171
- [ ] Click the deploy button on the "Upload" stage and make sure that it succeeds
7272
- [ ] Make sure no extraneous files are being included in the `.vsix` file (make sure to check for hidden files)
7373
- [ ] Click the deploy button on the "Publish" stage, this will push out the release to the public
@@ -79,7 +79,7 @@
7979
- [ ] Publish [documentation changes](https://github.com/Microsoft/vscode-docs/pulls?q=is%3Apr+is%3Aopen+label%3Apython)
8080
- [ ] Publish the [blog](http://aka.ms/pythonblog) post
8181
- [ ] Determine if a hotfix is needed
82-
- [ ] Merge `release-YYYY.MM` back into `master`. Don't overwrite the master `-dev` version in package.json. (🤖)
82+
- [ ] Merge `release-YYYY.MM` back into `main`. Don't overwrite the `-dev` version in package.json. (🤖)
8383

8484
## Clean up after _this_ release
8585

@@ -88,5 +88,5 @@
8888

8989
## Prep for the _next_ release
9090

91-
- [ ] Create a new [release plan](https://raw.githubusercontent.com/microsoft/vscode-python/master/.github/release_plan.md) (🤖)
91+
- [ ] Create a new [release plan](https://raw.githubusercontent.com/microsoft/vscode-python/main/.github/release_plan.md) (🤖)
9292
- [ ] [(Un-)pin](https://help.github.com/en/articles/pinning-an-issue-to-your-repository) [release plan issues](https://github.com/Microsoft/vscode-python/labels/release%20plan) (🤖)

.github/test_plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ def foo():pass
234234

235235
### [Debugging](https://code.visualstudio.com/docs/python/debugging)
236236

237-
- [ ] [Configurations](https://code.visualstudio.com/docs/python/debugging#_debugging-specific-app-types) work (see [`package.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) and the `"configurationSnippets"` section for all of the possible configurations)
237+
- [ ] [Configurations](https://code.visualstudio.com/docs/python/debugging#_debugging-specific-app-types) work (see [`package.json`](https://github.com/Microsoft/vscode-python/blob/main/package.json) and the `"configurationSnippets"` section for all of the possible configurations)
238238
- [ ] Running code from start to finish w/ no special debugging options (e.g. no breakpoints)
239239
- [ ] Breakpoint-like things
240240
- [ ] Breakpoint

.github/workflows/insiders.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name: Insiders Build
33
on:
44
push:
55
branches:
6-
- master
76
- main
87

98
env:

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2872,7 +2872,7 @@ part of!
28722872
([#7376](https://github.com/Microsoft/vscode-python/issues/7376))
28732873
1. Refactor Azure Pipelines to use stages.
28742874
([#7431](https://github.com/Microsoft/vscode-python/issues/7431))
2875-
1. Add unit tests to guarantee that the extension version in the master branch has the '-dev' suffix.
2875+
1. Add unit tests to guarantee that the extension version in the main branch has the '-dev' suffix.
28762876
([#7471](https://github.com/Microsoft/vscode-python/issues/7471))
28772877
1. Add a smoke test for the `Interactive Window`.
28782878
([#7653](https://github.com/Microsoft/vscode-python/issues/7653))
@@ -4947,7 +4947,7 @@ part of!
49474947
([#3317](https://github.com/Microsoft/vscode-python/issues/3317))
49484948
1. Add YAML file specification for CI builds
49494949
([#3350](https://github.com/Microsoft/vscode-python/issues/3350))
4950-
1. Stop running CI tests against the `master` branch of ptvsd.
4950+
1. Stop running CI tests against the `main` branch of ptvsd.
49514951
([#3414](https://github.com/Microsoft/vscode-python/issues/3414))
49524952
1. Be more aggressive in searching for a Python environment that can run Jupyter
49534953
(make sure to cleanup any kernelspecs that are created during this process).
@@ -5818,7 +5818,7 @@ nearly as feature-rich and useful as it is.
58185818
([#1703](https://github.com/Microsoft/vscode-python/issues/1703))
58195819
1. Update debug capabilities to add support for the setting `supportTerminateDebuggee` due to an upstream update from [PTVSD](https://github.com/Microsoft/ptvsd/issues).
58205820
([#1719](https://github.com/Microsoft/vscode-python/issues/1719))
5821-
1. Build and upload development build of the extension to the Azure blob store even if CI tests fail on the `master` branch.
5821+
1. Build and upload development build of the extension to the Azure blob store even if CI tests fail on the `main` branch.
58225822
([#1730](https://github.com/Microsoft/vscode-python/issues/1730))
58235823
1. Changes to the script used to upload the extension to the Azure blob store.
58245824
([#1732](https://github.com/Microsoft/vscode-python/issues/1732))
@@ -5948,7 +5948,7 @@ his help on [our issue tracker](https://github.com/Microsoft/vscode-python)!
59485948
([#1216](https://github.com/Microsoft/vscode-python/issues/1216))
59495949
1. Parallelize jobs (unit tests) on CI server.
59505950
([#1247](https://github.com/Microsoft/vscode-python/issues/1247))
5951-
1. Run CI tests against the release version and master branch of PTVSD (experimental debugger), allowing tests to fail against the master branch of PTVSD.
5951+
1. Run CI tests against the release version and main branch of PTVSD (experimental debugger), allowing tests to fail against the main branch of PTVSD.
59525952
([#1253](https://github.com/Microsoft/vscode-python/issues/1253))
59535953
1. Only trigger the extension for `file` and `untitled` in preparation for
59545954
[Visual Studio Live Share](https://aka.ms/vsls)

0 commit comments

Comments
 (0)