From f2f59614660630bdd7b492d677b7abbaa9cf3755 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Sat, 14 Feb 2026 09:19:43 -0500 Subject: [PATCH] change "master" branch references to "main" and incidentally remove a defunct Travis button from README.rst. The default branch itself was changed long ago, but not the references to it in code and documentation. --- CHANGELOG | 3 ++- CONTRIBUTING.rst | 6 +++--- README.rst | 7 ++----- release.py | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f108609..32dbaf7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,8 @@ (released on TBD) -- Update license dates +- Update license dates. +- Change `master` branch references to `main`. ## Version 2.10.0 diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index a7e9d2a..482844f 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -39,14 +39,14 @@ Ready to contribute? Here's how to set up CLI Helpers for local development. $ pip install -r requirements-dev.txt $ pip install --editable . -6. Create a branch for your bugfix or feature based off the ``master`` branch:: +6. Create a branch for your bugfix or feature based off the ``main`` branch:: - $ git checkout -b master + $ git checkout -b main 7. While you work on your bugfix or feature, be sure to pull the latest changes from ``upstream``. This ensures that your local codebase is up-to-date:: - $ git pull upstream master + $ git pull upstream main 8. When your work is ready for the CLI Helpers team to review it, make sure to add an entry to CHANGELOG file, and add your name to the AUTHORS file. diff --git a/README.rst b/README.rst index 4936647..6b8787c 100644 --- a/README.rst +++ b/README.rst @@ -2,13 +2,10 @@ CLI Helpers =========== -.. image:: https://travis-ci.org/dbcli/cli_helpers.svg?branch=master - :target: https://travis-ci.org/dbcli/cli_helpers - -.. image:: https://ci.appveyor.com/api/projects/status/37a1ri2nbcp237tr/branch/master?svg=true +.. image:: https://ci.appveyor.com/api/projects/status/37a1ri2nbcp237tr/branch/main?svg=true :target: https://ci.appveyor.com/project/dbcli/cli-helpers -.. image:: https://codecov.io/gh/dbcli/cli_helpers/branch/master/graph/badge.svg +.. image:: https://codecov.io/gh/dbcli/cli_helpers/branch/main/graph/badge.svg :target: https://codecov.io/gh/dbcli/cli_helpers .. image:: https://img.shields.io/pypi/v/cli_helpers.svg?style=flat diff --git a/release.py b/release.py index 7a68271..7ecd480 100644 --- a/release.py +++ b/release.py @@ -74,7 +74,7 @@ def upload_distribution_files(): def push_to_github(): - run_step("git", "push", "origin", "master") + run_step("git", "push", "origin", "main") def push_tags_to_github():