Merge pull request #136 from denyeart/master_to_main

Update "master" branch references to "main"

.github/settings.yml

@@ -2,7 +2,7 @@ repository:
   name: fabric-sdk-py
   description: Hyperledger Fabric Python SDK
   homepage: https://fabric-sdk-py.readthedocs.io/en/latest/
-  default_branch: master
+  default_branch: main
   has_downloads: true
   has_issues: true
   has_projects: false

CONTRIBUTING.md

@@ -53,7 +53,7 @@ The project employs [Github](https://github.com/hyperledger/fabric-sdk-py) as th
 $ git clone https://github.com/hyperledger/fabric-sdk-py.git
 $ cd fabric-sdk-py
 $ hub fork --remote-name=origin
-$ git branch master --set-upstream-to origin/master
+$ git branch main --set-upstream-to origin/main
 ```
 
 (Optionally) Config your git name and email if not setup previously.
@@ -67,7 +67,7 @@ $ git config user.email "your email"
 
 ```sh
 $ cd fabric-sdk-py
-$ git fetch upstream master && git rebase FETCH_HEAD && git push -f origin
+$ git fetch upstream main && git rebase FETCH_HEAD && git push -f origin
 $ git checkout -b FABP-XXXX
 ```
 
@@ -103,7 +103,7 @@ $ hub pull-request
 ```
 Notice you will get a [GitHub URL](https://github.com/hyperledger/fabric-sdk-py/pull/77), open and check the status.
 
-After the ci checking passed, add [reviewers](https://wiki.hyperledger.org/projects/fabric-sdk-py#contributors) to the reviewer list and also post the GitHub PR url in the [chat channel](https://chat.hyperledger.org/channel/fabric-sdk-py). The patch will be merged into the `master` branch after passing the review, then mark the Jira item as `Done`.
+After the ci checking passed, add [reviewers](https://wiki.hyperledger.org/projects/fabric-sdk-py#contributors) to the reviewer list and also post the GitHub PR url in the [chat channel](https://chat.hyperledger.org/channel/fabric-sdk-py). The patch will be merged into the `main` branch after passing the review, then mark the Jira item as `Done`.
 
 * If you need to refine the patch further as the reviewers may suggest, you can change on the same branch, and commit the new code with `git commit -a --amend`, and then use the `git review` command again.
 

README.md

@@ -64,7 +64,7 @@ $ make proto
 See [Change Log](CHANGELOG.md) for the commit logs. Run `make changelog` to update the changelog before new release.
 
 ## Bug, Question and Code Contributions
-Welcome for any kind of contributions, e.g., [bugs](https://jira.hyperledger.org/projects/FABP), [questions](https://chat.hyperledger.org/channel/fabric-sdk-py) and [documentation](https://github.com/hyperledger/fabric-sdk-py/tree/master/docs)!
+Welcome for any kind of contributions, e.g., [bugs](https://jira.hyperledger.org/projects/FABP), [questions](https://chat.hyperledger.org/channel/fabric-sdk-py) and [documentation](https://github.com/hyperledger/fabric-sdk-py/tree/main/docs)!
 
 Recommend to read [How to Contribution](CONTRIBUTING.md) before taking action.
 

Tutorial.ipynb

@@ -7,7 +7,7 @@
     "# Fabric SDK Python\n",
     "\n",
     "Before getting started, make sure the Python SDK is installed properly and the network is up and running.\n",
-    "For more information regarding installation process and how to set up the network please refer to [this](https://github.com/hyperledger/fabric-sdk-py/blob/master/docs/source/tutorial.md)."
+    "For more information regarding installation process and how to set up the network please refer to [this](https://github.com/hyperledger/fabric-sdk-py/blob/main/docs/source/tutorial.md)."
    ]
   },
   {

ci/azure-pipeline.yml

@@ -6,11 +6,11 @@ name: $(SourceBranchName)-$(Date:yyyyMMdd)$(Rev:.rrr)
 trigger:
   branches:
     include:
-      - master
+      - main
 pr:
   branches:
     include:
-      - master
+      - main
 pool:
   vmImage: ubuntu-18.04
 

docs/source/conf.py

@@ -27,7 +27,7 @@
 
 master_doc = 'index'
 
-github_doc_root = 'https://github.com/hyperledger/fabric-sdk-py/tree/master/docs/'
+github_doc_root = 'https://github.com/hyperledger/fabric-sdk-py/tree/main/docs/'
 # app setup hook
 
 

docs/source/index.md

@@ -44,23 +44,23 @@ We are an opensource community and always welcome your questions.
 Feel free to ask any question on our community [here](https://chat.hyperledger.org/channel/fabric-sdk-py).
 
 ## Get started and read our Documentation
-You can find our documentation [here](https://github.com/hyperledger/fabric-sdk-py/tree/master/docs).
+You can find our documentation [here](https://github.com/hyperledger/fabric-sdk-py/tree/main/docs).
 
 ## Feel free to contribute
-Let's get started and contribute to Fabric-SDK-Py! You can start [here](https://github.com/hyperledger/fabric-sdk-py/blob/master/CONTRIBUTING.md).
+Let's get started and contribute to Fabric-SDK-Py! You can start [here](https://github.com/hyperledger/fabric-sdk-py/blob/main/CONTRIBUTING.md).
 
 ## Some Important Links
 * [Fabric SDK Python Wiki](https://wiki.hyperledger.org/display/fabric/Hyperledger+Fabric+SDK+Py)
 * [Hyperledger Project](https://www.hyperledger.org/)
 * [Hyperledger mailing lists](https://lists.hyperledger.org/g/main)
 
 ## License
-The Hyperledger Fabric-SDK-Py software uses the [Apache License Version 2.0](https://github.com/hyperledger/fabric-sdk-py/blob/master/LICENSE) software license.
+The Hyperledger Fabric-SDK-Py software uses the [Apache License Version 2.0](https://github.com/hyperledger/fabric-sdk-py/blob/main/LICENSE) software license.
 This document is licensed under a [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/).
 
 ## Package Reference
 
 * [Tutorial](tutorial.md)
 * [Release Note](release_note.md)
 * [Code Style](code_style.md)
-* [Contributing](CONTRIBUTING.md)
+* [Contributing](CONTRIBUTING.md)

docs/source/tutorial.md

@@ -73,7 +73,7 @@ A network connection profile helps SDK connect to the fabric network by providin
 
 * Client credentials file location;
 * Service endpoints for peer, orderer and ca;
-The [network.json](https://github.com/hyperledger/fabric-sdk-py/blob/master/test/fixtures/network.json
+The [network.json](https://github.com/hyperledger/fabric-sdk-py/blob/main/test/fixtures/network.json
 ) is an example, please modify the content accordingly.
 
 The user key and cert can be passed to the SDK via the connection profile in three different ways.
@@ -82,7 +82,7 @@ The user key and cert can be passed to the SDK via the connection profile in thr
 |------------------|-------------|-------------|
 | `"cert": {"pem": "base64 encoded cert"}` | The cert or key can be passed in a base64 encoded fashion via the `cert` parameter. | Good for testing and debugging. Should not be used for productive user-cases. |
 | `"private_key": {"path": "/path/to/the/private_key"}` | The path to the cert or can be passed via the `path` parameter. | Standard way for key and cert parameters. |
-| `"cert": "path/to/the/cert"` | The path can be passed directly without an additional `path` attribute. | Same as above, necessary to maintain backwards compatibility. 
+| `"cert": "path/to/the/cert"` | The path can be passed directly without an additional `path` attribute. | Same as above, necessary to maintain backwards compatibility.
 
 Now you can use the Python SDK to work with the fabric network!