Updates for our new main branch (pyca#5818)

alex · web-flow · commit cfd079a0343f · 2021-02-11T21:15:39.000-06:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ on:
   pull_request: {}
   push:
     branches:
-      - master
+      - main
       - '*.*.x'
     tags:
       - '*.*'
@@ -338,7 +338,7 @@ jobs:
       - run: ./.github/downstream.d/${{ matrix.DOWNSTREAM }}.sh run
 
   docs-linkcheck:
-    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     name: "linkcheck"
     timeout-minutes: 30
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,8 +3,8 @@ Changelog
 
 .. _v3-5:
 
-3.5 - `master`_
-~~~~~~~~~~~~~~~~
+3.5 - `main`_
+~~~~~~~~~~~~~
 
  .. note:: This version is not yet released and is under active development.
 
@@ -1691,5 +1691,5 @@ Changelog
 
 * Initial release.
 
-.. _`master`: https://github.com/pyca/cryptography/
+.. _`main`: https://github.com/pyca/cryptography/
 .. _`cffi`: https://cffi.readthedocs.io/
diff --git a/README.rst b/README.rst
@@ -9,11 +9,11 @@ pyca/cryptography
     :target: https://cryptography.io
     :alt: Latest Docs
 
-.. image:: https://github.com/pyca/cryptography/workflows/CI/badge.svg?branch=master
-    :target: https://github.com/pyca/cryptography/actions?query=workflow%3ACI+branch%3Amaster
+.. image:: https://github.com/pyca/cryptography/workflows/CI/badge.svg?branch=main
+    :target: https://github.com/pyca/cryptography/actions?query=workflow%3ACI+branch%3Amain
 
-.. image:: https://codecov.io/github/pyca/cryptography/coverage.svg?branch=master
-    :target: https://codecov.io/github/pyca/cryptography?branch=master
+.. image:: https://codecov.io/github/pyca/cryptography/coverage.svg?branch=main
+    :target: https://codecov.io/github/pyca/cryptography?branch=main
 
 
 ``cryptography`` is a package which provides cryptographic recipes and
diff --git a/docs/development/reviewing-patches.rst b/docs/development/reviewing-patches.rst
@@ -41,15 +41,15 @@ Merge requirements
 Because cryptography is so complex, and the implications of getting it wrong so
 devastating, ``cryptography`` has a strict merge policy for committers:
 
-* Patches must *never* be pushed directly to ``master``, all changes (even the
+* Patches must *never* be pushed directly to ``main``, all changes (even the
   most trivial typo fixes!) must be submitted as a pull request.
 * A committer may *never* merge their own pull request, a second party must
   merge their changes. If multiple people work on a pull request, it must be
   merged by someone who did not work on it.
 * A patch that breaks tests, or introduces regressions by changing or removing
   existing tests should not be merged. Tests must always be passing on
-  ``master``.
-* If somehow the tests get into a failing state on ``master`` (such as by a
+  ``main``.
+* If somehow the tests get into a failing state on ``main`` (such as by a
   backwards incompatible release of a dependency) no pull requests may be
   merged until this is rectified.
 * All merged patches must have 100% test coverage.
diff --git a/docs/security.rst b/docs/security.rst
@@ -64,7 +64,7 @@ further follow-up emails.
 Supported Versions
 ------------------
 
-At any given time, we will provide security support for the `master`_ branch
+At any given time, we will provide security support for the `main`_ branch
 as well as the most recent release.
 
 New releases for OpenSSL updates
@@ -89,4 +89,4 @@ The steps for issuing a security release are described in our
 :doc:`/doing-a-release` documentation.
 
 
-.. _`master`: https://github.com/pyca/cryptography
+.. _`main`: https://github.com/pyca/cryptography
diff --git a/release.py b/release.py
@@ -90,7 +90,7 @@ def build_github_actions_wheels(token, version):
             "Accept": "application/vnd.github.v3+json",
             "Authorization": "token {}".format(token),
         },
-        data=json.dumps({"ref": "master", "inputs": {"version": version}}),
+        data=json.dumps({"ref": "main", "inputs": {"version": version}}),
     )
     response.raise_for_status()
 

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ def build_github_actions_wheels(token, version):`
`90`	`90`	`"Accept": "application/vnd.github.v3+json",`
`91`	`91`	`"Authorization": "token {}".format(token),`
`92`	`92`	`},`
`93`		`- data=json.dumps({"ref": "master", "inputs": {"version": version}}),`
	`93`	`+ data=json.dumps({"ref": "main", "inputs": {"version": version}}),`
`94`	`94`	`)`
`95`	`95`	`response.raise_for_status()`
`96`	`96`