master -> main

.circleci/config.yml

@@ -126,7 +126,7 @@ workflows:
             tags:
               only: /v[0-9]+.*/
             branches:
-              only: master
+              only: main
           requires:
             - test_build
       - publish_docker_experimental:
@@ -137,7 +137,7 @@ workflows:
             tags:
               only: /.*/
             branches:
-              only: master
+              only: main
       - request_publication_approval:
           type: approval
           requires:
@@ -172,7 +172,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - main
     jobs:
       - pipenv_install_36:
           filters:
@@ -311,7 +311,7 @@ workflows:
             tags:
               only: /v[0-9]+.*/
             branches:
-              only: master
+              only: main
           requires:
             - test_build
 

Makefile

@@ -53,7 +53,7 @@ release: clean
 	# previous dry-run runs *without* --allow-dirty which ensures it's really just the release notes
 	# file that we are allowing to sit here dirty, waiting to get included in the release commit.
 	bumpversion --allow-dirty $(bump)
-	git push upstream master && git push upstream v$(UPCOMING_VERSION)
+	git push upstream main && git push upstream v$(UPCOMING_VERSION)
 	# Restore the original system setting for commit signing
 	git config commit.gpgSign "$(CURRENT_SIGN_SETTING)"
 

README.md

@@ -4,8 +4,8 @@
 
 [![pypi](https://img.shields.io/pypi/v/nucypher.svg?style=flat)](https://pypi.org/project/nucypher/)
 [![pyversions](https://img.shields.io/pypi/pyversions/nucypher.svg)](https://pypi.org/project/nucypher/)
-[![codecov](https://codecov.io/gh/nucypher/nucypher/branch/master/graph/badge.svg)](https://codecov.io/gh/nucypher/nucypher)
-[![circleci](https://img.shields.io/circleci/project/github/nucypher/nucypher.svg?logo=circleci)](https://circleci.com/gh/nucypher/nucypher/tree/master)
+[![codecov](https://codecov.io/gh/nucypher/nucypher/branch/main/graph/badge.svg)](https://codecov.io/gh/nucypher/nucypher)
+[![circleci](https://img.shields.io/circleci/project/github/nucypher/nucypher.svg?logo=circleci)](https://circleci.com/gh/nucypher/nucypher/tree/main)
 [![discord](https://img.shields.io/discord/411401661714792449.svg?logo=discord)](https://discord.gg/7rmXa3S)
 [![Documentation Status](https://readthedocs.org/projects/nucypher/badge/?version=latest)](https://nucypher.readthedocs.io/en/latest/)
 [![license](https://img.shields.io/pypi/l/nucypher.svg)](https://www.gnu.org/licenses/gpl-3.0.html)

docs/source/conf.py

@@ -75,8 +75,8 @@ templates_path = ['.templates']
 
 source_suffix = '.rst'
 
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -161,7 +161,7 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'NuCypher.tex', 'NuCypher Documentation',
+    (main_doc, 'NuCypher.tex', 'NuCypher Documentation',
      'NuCypher', 'manual'),
 ]
 
@@ -171,7 +171,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'nucypher', 'NuCypher Documentation',
+    (main_doc, 'nucypher', 'NuCypher Documentation',
      [author], 1)
 ]
 
@@ -182,7 +182,7 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'NuCypher', 'NuCypher Documentation',
+    (main_doc, 'NuCypher', 'NuCypher Documentation',
      author, 'NuCypher', 'A proxy re-encryption network to empower privacy in decentralized systems.',
      'Miscellaneous'),
 ]

docs/source/guides/contribution_guide.rst

@@ -113,7 +113,7 @@ Pull Request Conflicts
 ----------------------
 
 As an effort to preserve authorship and a cohesive commit history, we prefer if proposed contributions
-are rebased over master (or appropriate branch) when a merge conflict arises,
+are rebased over `main` (or appropriate branch) when a merge conflict arises,
 instead of making a merge commit back into the contributors fork.
 
 Generally speaking the preferred process of doing so is with an `interactive rebase`:
@@ -129,7 +129,7 @@ Generally speaking the preferred process of doing so is with an `interactive reb
    $ git remote update
    ...  (some upstream changes are reported)
 
-2. Initiate an interactive rebase over ``nucypher/nucypher@master``
+2. Initiate an interactive rebase over ``nucypher/nucypher@main``
 
 .. note::
 
@@ -138,7 +138,7 @@ Generally speaking the preferred process of doing so is with an `interactive reb
 
 .. code-block:: bash
 
-   $ git rebase -i upstream/master
+   $ git rebase -i upstream/main
    ...  (edit & save rebase TODO list)
 
 3. Resolve Conflicts
@@ -216,7 +216,7 @@ Issuing a New Release
 
 .. important::
 
-   Ensure your local tree is based on ``master`` and has no uncommitted changes.
+   Ensure your local tree is based on ``main`` and has no uncommitted changes.
 
 1. Decide what part of the version to bump.
 The version string follows the format ``{major}.{minor}.{patch}-{stage}.{devnum}``,

docs/source/guides/federated_testnet_guide.rst

@@ -86,7 +86,7 @@ Install ``nucypher`` with ``git`` and ``pip3`` into your virtual environment.
 
 .. note::
 
-   We recommend NuFT nodes install directly from master to help ensure your node is using pre-released features and hotfixes
+   We recommend NuFT nodes install directly from main to help ensure your node is using pre-released features and hotfixes
 
 
 Re-activate your environment after installing

docs/source/index.rst

@@ -12,10 +12,10 @@ NuCypher
     :target: https://pypi.org/project/nucypher/
 
 .. image:: https://img.shields.io/circleci/project/github/nucypher/nucypher.svg?logo=circleci
-    :target: https://circleci.com/gh/nucypher/nucypher/tree/master
+    :target: https://circleci.com/gh/nucypher/nucypher/tree/main
     :alt: CircleCI build status
 
-.. image:: https://codecov.io/gh/nucypher/nucypher/branch/master/graph/badge.svg
+.. image:: https://codecov.io/gh/nucypher/nucypher/branch/main/graph/badge.svg
     :target: https://codecov.io/gh/nucypher/nucypher
 
 .. image:: https://img.shields.io/discord/411401661714792449.svg?logo=discord

nucypher/blockchain/eth/registry.py

@@ -74,7 +74,7 @@ class GithubRegistrySource(CanonicalRegistrySource):
     is_primary = True
 
     def get_publication_endpoint(self) -> str:
-        url = f'{self._BASE_URL}/master/nucypher/blockchain/eth/contract_registry/{self.network}/{self.registry_name}'
+        url = f'{self._BASE_URL}/main/nucypher/blockchain/eth/contract_registry/{self.network}/{self.registry_name}'
         return url
 
     def fetch_latest_publication(self) -> Union[str, bytes]:

tests/contracts/test_contracts_upgradeability.py

@@ -31,7 +31,7 @@ from tests.constants import INSECURE_DEVELOPMENT_PASSWORD
 
 USER = "nucypher"
 REPO = "nucypher"
-BRANCH = "master"
+BRANCH = "main"
 GITHUB_SOURCE_LINK = f"https://api.github.com/repos/{USER}/{REPO}/contents/nucypher/blockchain/eth/sol/source?ref={BRANCH}"