diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index f09238e..ffbe308 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -4,12 +4,12 @@ name: Test Suite on: push: branches: - - master + - main tags: - "v*" pull_request: branches: - - master + - main concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/Changelog b/Changelog index d5a4a83..b68e555 100644 --- a/Changelog +++ b/Changelog @@ -5,6 +5,7 @@ Version 0.1.25 unreleased * Update dependencies to address Dependabot warnings. * Upgrade to gha-shared-workflows@v7 with publish improvements. * Add a default .pytest.ini file based on new cookiecutter template. + * Change the default branch in GitHub from master to main. Version 0.1.24 15 Oct 2024 diff --git a/DEVELOPER.md b/DEVELOPER.md index a095d55..d617a14 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -368,8 +368,8 @@ partially-automated process to publish a new release. > _Note:_ In order to publish code, you must must have push permissions to the > GitHub repo. -Ensure that you are on the `master` branch. Releases must always be done from -`master`. +Ensure that you are on the `main` branch. Releases must always be done from +`main`. Ensure that the `Changelog` is up-to-date and reflects all of the changes that will be published. The top line must show your version as unreleased: diff --git a/PyPI.md b/PyPI.md index ab01fba..9215dd3 100644 --- a/PyPI.md +++ b/PyPI.md @@ -1,12 +1,12 @@ # UCI Parse Library [![pypi](https://img.shields.io/pypi/v/uciparse.svg)](https://pypi.org/project/uciparse/) -[![license](https://img.shields.io/pypi/l/uciparse.svg)](https://github.com/pronovic/uci-parse/blob/master/LICENSE) +[![license](https://img.shields.io/pypi/l/uciparse.svg)](https://github.com/pronovic/uci-parse/blob/main/LICENSE) [![wheel](https://img.shields.io/pypi/wheel/uciparse.svg)](https://pypi.org/project/uciparse/) [![python](https://img.shields.io/pypi/pyversions/uciparse.svg)](https://pypi.org/project/uciparse/) [![Test Suite](https://github.com/pronovic/uci-parse/workflows/Test%20Suite/badge.svg)](https://github.com/pronovic/uci-parse/actions?query=workflow%3A%22Test+Suite%22) [![docs](https://readthedocs.org/projects/uci-parse/badge/?version=stable&style=flat)](https://uci-parse.readthedocs.io/en/stable/) -[![coverage](https://coveralls.io/repos/github/pronovic/uci-parse/badge.svg?branch=master)](https://coveralls.io/github/pronovic/uci-parse?branch=master) +[![coverage](https://coveralls.io/repos/github/pronovic/uci-parse/badge.svg?branch=main)](https://coveralls.io/github/pronovic/uci-parse?branch=main) [![Poetry](https://img.shields.io/endpoint?url=https://python-poetry.org/badge/v0.json)](https://python-poetry.org/) Python 3 library and command line tools to parse, diff, and normalize OpenWRT diff --git a/README.md b/README.md index fa7288d..a42fbd6 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # UCI Parse Library [![pypi](https://img.shields.io/pypi/v/uciparse.svg)](https://pypi.org/project/uciparse/) -[![license](https://img.shields.io/pypi/l/uciparse.svg)](https://github.com/pronovic/uci-parse/blob/master/LICENSE) +[![license](https://img.shields.io/pypi/l/uciparse.svg)](https://github.com/pronovic/uci-parse/blob/main/LICENSE) [![wheel](https://img.shields.io/pypi/wheel/uciparse.svg)](https://pypi.org/project/uciparse/) [![python](https://img.shields.io/pypi/pyversions/uciparse.svg)](https://pypi.org/project/uciparse/) [![Test Suite](https://github.com/pronovic/uci-parse/workflows/Test%20Suite/badge.svg)](https://github.com/pronovic/uci-parse/actions?query=workflow%3A%22Test+Suite%22) [![docs](https://readthedocs.org/projects/uci-parse/badge/?version=stable&style=flat)](https://uci-parse.readthedocs.io/en/stable/) -[![coverage](https://coveralls.io/repos/github/pronovic/uci-parse/badge.svg?branch=master)](https://coveralls.io/github/pronovic/uci-parse?branch=master) +[![coverage](https://coveralls.io/repos/github/pronovic/uci-parse/badge.svg?branch=main)](https://coveralls.io/github/pronovic/uci-parse?branch=main) [![Poetry](https://img.shields.io/endpoint?url=https://python-poetry.org/badge/v0.json)](https://python-poetry.org/) Python 3 library and command line tools to parse, diff, and normalize OpenWRT diff --git a/docs/index.rst b/docs/index.rst index 2c8265f..ef5cb8c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -7,7 +7,7 @@ Release v\ |version| :target: https://pypi.org/project/uciparse/ .. image:: https://img.shields.io/pypi/l/uciparse.svg - :target: https://github.com/pronovic/uci-parse/blob/master/LICENSE + :target: https://github.com/pronovic/uci-parse/blob/main/LICENSE .. image:: https://img.shields.io/pypi/wheel/uciparse.svg :target: https://pypi.org/project/uciparse/ @@ -21,8 +21,8 @@ Release v\ |version| .. image:: https://readthedocs.org/projects/uci-parse/badge/?version=stable&style=flat :target: https://uci-parse.readthedocs.io/en/stable/ -.. image:: https://coveralls.io/repos/github/pronovic/uci-parse/badge.svg?branch=master - :target: https://coveralls.io/github/pronovic/uci-parse?branch=master +.. image:: https://coveralls.io/repos/github/pronovic/uci-parse/badge.svg?branch=main + :target: https://coveralls.io/github/pronovic/uci-parse?branch=main Python 3 library and command line tools to parse, diff, and normalize OpenWRT UCI_ configuration files.