From 37792e03321558cfbc175741c485e45fc828154c Mon Sep 17 00:00:00 2001 From: Will Dumm Date: Mon, 7 Nov 2022 08:05:59 -0800 Subject: [PATCH] rename master to main (#112) --- .github/workflows/build-and-test.yml | 4 ++-- .github/workflows/docs-build-and-deploy.yml | 2 +- docs/developer.rst | 2 +- gctree/_version.py | 2 +- versioneer.py | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 7a391e23..23d58a46 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,9 +2,9 @@ name: build and test on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: diff --git a/.github/workflows/docs-build-and-deploy.yml b/.github/workflows/docs-build-and-deploy.yml index aa933c9f..9c6332d1 100644 --- a/.github/workflows/docs-build-and-deploy.yml +++ b/.github/workflows/docs-build-and-deploy.yml @@ -2,7 +2,7 @@ name: Docs build and deploy on: push: branches: - - master + - main jobs: build-and-deploy: concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession. diff --git a/docs/developer.rst b/docs/developer.rst index 15507960..19b28616 100644 --- a/docs/developer.rst +++ b/docs/developer.rst @@ -26,7 +26,7 @@ Build docs locally (you can then see the generated documentation in ``docs/_buil make docs -Docs are automatically deployed to github pages via a workflow on push to the master branch. +Docs are automatically deployed to github pages via a workflow on push to the main branch. Todo list ========= diff --git a/gctree/_version.py b/gctree/_version.py index 6faae8ca..02f933d9 100644 --- a/gctree/_version.py +++ b/gctree/_version.py @@ -199,7 +199,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): # refs/heads/ and refs/tags/ prefixes that would let us distinguish # between branches and tags. By ignoring refnames without digits, we # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". + # "stabilization", as well as "HEAD" and "main". tags = set([r for r in refs if re.search(r"\d", r)]) if verbose: print("discarding '%s', no digits" % ",".join(refs - tags)) diff --git a/versioneer.py b/versioneer.py index 64fea1c8..36b1b54d 100644 --- a/versioneer.py +++ b/versioneer.py @@ -175,8 +175,8 @@ two common reasons why `setup.py` might not be in the root: * Source trees which contain multiple subprojects, such as - [Buildbot](https://github.com/buildbot/buildbot), which contains both - "master" and "slave" subprojects, each with their own `setup.py`, + [Buildbot](https://github.com/buildbot/buildbot), which contains + multiple subprojects, each with their own `setup.py`, `setup.cfg`, and `tox.ini`. Projects like these produce multiple PyPI distributions (and upload multiple independently-installable tarballs). * Source trees whose main purpose is to contain a C library, but which also @@ -609,7 +609,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): # refs/heads/ and refs/tags/ prefixes that would let us distinguish # between branches and tags. By ignoring refnames without digits, we # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". + # "stabilization", as well as "HEAD" and "main". tags = set([r for r in refs if re.search(r'\d', r)]) if verbose: print("discarding '%%s', no digits" %% ",".join(refs - tags)) @@ -1001,7 +1001,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): # refs/heads/ and refs/tags/ prefixes that would let us distinguish # between branches and tags. By ignoring refnames without digits, we # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". + # "stabilization", as well as "HEAD" and "main". tags = set([r for r in refs if re.search(r'\d', r)]) if verbose: print("discarding '%s', no digits" % ",".join(refs - tags))