Merge pull request #1403 from PyCQA/master-to-main

master -> main
PyCQA · Oct 10, 2021 · 08a3307 · 08a3307
2 parents 21d3c70 + ea52cb6
commit 08a3307
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,7 +2,7 @@ name: main
 
 on:
   push:
-    branches: [master]
+    branches: [main]
     tags:
   pull_request:
 

diff --git a/README.rst b/README.rst
@@ -2,8 +2,8 @@
    :target: https://github.com/PyCQA/flake8/actions?query=workflow%3Amain
    :alt: build status
 
-.. image:: https://results.pre-commit.ci/badge/github/PyCQA/flake8/master.svg
-   :target: https://results.pre-commit.ci/latest/github/PyCQA/flake8/master
+.. image:: https://results.pre-commit.ci/badge/github/PyCQA/flake8/main.svg
+   :target: https://results.pre-commit.ci/latest/github/PyCQA/flake8/main
    :alt: pre-commit.ci status
 
 ========

diff --git a/codecov.yml b/codecov.yml
@@ -1,5 +1,5 @@
 codecov:
-  branch: master
+  branch: main
   bot: null
 
 coverage:
@@ -12,7 +12,7 @@ coverage:
       default:
         server: chat.freenode.net
         channel: '##python-code-quality'
-        branches: master
+        branches: main
         threshold: 2
         message: null
 

diff --git a/tox.ini b/tox.ini
@@ -13,7 +13,7 @@ commands =
     # ensure 100% coverage of tests
     coverage report --fail-under 100 --include tests/*
 
-# Dogfood our current master version
+# Dogfood our current main version
 [testenv:dogfood]
 skip_install = true
 deps =
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: main @@
     on:
       push:
-        branches: [master]
+        branches: [main]
         tags:
       pull_request:
@@ Expand Down @@