Skip to content

Commit

Permalink
Merge pull request #1403 from PyCQA/master-to-main
Browse files Browse the repository at this point in the history
master -> main
  • Loading branch information
asottile authored Oct 10, 2021
2 parents 21d3c70 + ea52cb6 commit 08a3307
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: main

on:
push:
branches: [master]
branches: [main]
tags:
pull_request:

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

========
Expand Down
4 changes: 2 additions & 2 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
codecov:
branch: master
branch: main
bot: null

coverage:
Expand All @@ -12,7 +12,7 @@ coverage:
default:
server: chat.freenode.net
channel: '##python-code-quality'
branches: master
branches: main
threshold: 2
message: null

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down

0 comments on commit 08a3307

Please sign in to comment.