diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 2a30c7e..99344e2 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -11,7 +11,7 @@ Closes # - [ ] Add or update documentation related to these changes -- [ ] Add entry to the [release notes](https://github.com/ethereum/hexbytes/blob/master/newsfragments/README.md) +- [ ] Add entry to the [release notes](https://github.com/ethereum/hexbytes/blob/main/newsfragments/README.md) #### Cute Animal Picture diff --git a/README.md b/README.md index 4cb5fad..92a4a04 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ The version format for this repo is `{major}.{minor}.{patch}` for stable, and To issue the next version in line, specify which part to bump, like `make release bump=minor` or `make release bump=devnum`. This is typically done from the -master branch, except when releasing a beta (in which case the beta is released from master, +main branch, except when releasing a beta (in which case the beta is released from main, and the previous stable branch is released from said branch). If you are in a beta version, `make release bump=stage` will switch to a stable. diff --git a/newsfragments/40.internal.rst b/newsfragments/40.internal.rst new file mode 100644 index 0000000..6559493 --- /dev/null +++ b/newsfragments/40.internal.rst @@ -0,0 +1 @@ +Change the name of ``master`` branch to ``main`` diff --git a/pyproject.toml b/pyproject.toml index ed8223b..5df2b4d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,7 @@ log_format = "%(levelname)8s %(asctime)s %(filename)20s %(message)s" log_date_format = "%m-%d %H:%M:%S" [tool.towncrier] -# Read https://github.com/ethereum/hexbytes/blob/master/newsfragments/README.md for instructions +# Read https://github.com/ethereum/hexbytes/blob/main/newsfragments/README.md for instructions package = "hexbytes" filename = "docs/release_notes.rst" directory = "newsfragments"