summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Sottile <asottile@umich.edu>2021-10-10 16:56:47 -0700
committerGitHub <noreply@github.com>2021-10-10 16:56:47 -0700
commit08a330730e3ecd21abddf0287c030496c0b8bfba (patch)
tree88c26d487a68a13a5cfe0e1b2a57f0fa6f753f59
parent21d3c70d676007470908d39b73f0521d39b3b997 (diff)
parentea52cb6f766c3ef394617c5cf9bea8a6cd668fd4 (diff)
downloadflake8-08a330730e3ecd21abddf0287c030496c0b8bfba.tar.gz
Merge pull request #1403 from PyCQA/master-to-main
master -> main
-rw-r--r--.github/workflows/main.yml2
-rw-r--r--README.rst4
-rw-r--r--codecov.yml4
-rw-r--r--tox.ini2
4 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a378c9b..c9b32d7 100644
--- 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
index 8ba1d6d..ddac952 100644
--- 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
index f7fc0be..475c4c5 100644
--- 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
index c2f3151..246f914 100644
--- 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 =