Skip to content

Commit

Permalink
docs: sub master refs with main (#2933)
Browse files Browse the repository at this point in the history
  • Loading branch information
wolovim authored Apr 25, 2023
1 parent 09baffc commit be03e44
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ notes:
git commit -m "Compile release notes"

release: clean
# require that you be on a branch that's linked to upstream/master
git status -s -b | head -1 | grep "\.\.upstream/master"
# require that you be on a branch that's linked to upstream/main
git status -s -b | head -1 | grep "\.\.upstream/main"
./newsfragments/validate_files.py is-empty
# verify that docs build correctly
make build-docs
Expand Down
10 changes: 5 additions & 5 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ requested.

If the pull request introduces changes that should be reflected in the release
notes, please add a **newsfragment** file as explained
`here <https://github.com/ethereum/web3.py/blob/master/newsfragments/README.md>`_.
`here <https://github.com/ethereum/web3.py/blob/main/newsfragments/README.md>`_.

If possible, the change to the release notes file should be included in the
commit that introduces the feature or bugfix.
Expand Down Expand Up @@ -399,7 +399,7 @@ CI Testing With a Nightly Geth Build

Occasionally you'll want to have CI run the test suite against an unreleased version of Geth,
for example, to test upcoming hard fork changes. The workflow described below is for testing only,
i.e., open a PR, let CI run the tests, but the changes should only be merged into master once the
i.e., open a PR, let CI run the tests, but the changes should only be merged into main once the
Geth release is published or you have some workaround that doesn't require test fixtures built from
an unstable client.

Expand Down Expand Up @@ -432,7 +432,7 @@ virtualenv for smoke testing:

.. code:: sh
$ git checkout master && git pull
$ git checkout main && git pull
$ make package
Expand Down Expand Up @@ -485,7 +485,7 @@ running ``make build-docs`` until it passes, then commit and carry on.
Push The Release to GitHub & PyPI
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

After committing the compiled release notes and pushing them to the master
After committing the compiled release notes and pushing them to the main
branch, release a new version:

.. code:: sh
Expand All @@ -512,7 +512,7 @@ version explicitly, like ``make release bump="--new-version 4.0.0-alpha.1 devnum


.. _Python Discord server: https://discord.gg/GHryRvPB84
.. _style guide: https://github.com/pipermerriam/ethereum-dev-tactical-manual/blob/master/style-guide.md
.. _style guide: https://github.com/ethereum/ethereum-dev-tactical-manual/blob/master/style-guide.md
.. _type hints: https://www.python.org/dev/peps/pep-0484/
.. _how to create documentation: https://github.com/ethereum/snake-charmers-tactical-manual/blob/master/documentation.md
.. _working on pull requests: https://help.github.com/articles/about-pull-requests/
Expand Down
1 change: 1 addition & 0 deletions newsfragments/2933.doc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update references to master branch
2 changes: 1 addition & 1 deletion tests/core/pm-module/test_ens_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def ens_setup(deployer):

# create ENS contract
# values borrowed from:
# https://github.com/ethereum/web3.py/blob/master/tests/ens/conftest.py#L109
# https://github.com/ethereum/web3.py/blob/main/tests/ens/conftest.py#L109
eth_labelhash = w3.keccak(text="eth")
eth_namehash = bytes32(
0x93CDEB708B7545DC668EB9280176169D1C33CFD8ED6F04690A0BCC88A93FC4AE
Expand Down

0 comments on commit be03e44

Please sign in to comment.