From faa6288a7d2dc5e5e43100a07981afa430e77747 Mon Sep 17 00:00:00 2001 From: Brett Date: Mon, 13 Mar 2023 13:44:52 -0400 Subject: [PATCH 1/2] rename master branch to main --- .github/dependabot.yml | 8 ++++---- .github/workflows/ci.yml | 2 +- .github/workflows/scheduled.yml | 2 +- CONTRIBUTING.rst | 4 ++-- README.rst | 4 ++-- docs/asdf/developer_versioning.rst | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c35b9c4dc..0de10cf48 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,17 +1,17 @@ version: 2 updates: - # Maintain dependencies for GitHub Actions (master) + # Maintain dependencies for GitHub Actions (main) - package-ecosystem: "github-actions" directory: "/" - target-branch: "master" + target-branch: "main" schedule: interval: "weekly" - # Maintain dependencies for pip (master) + # Maintain dependencies for pip (main) - package-ecosystem: "pip" directory: "/" - target-branch: "master" + target-branch: "main" schedule: interval: "weekly" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ed55569e..b27b04c7b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - master + - main - stable - '*.x' tags: diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 0fc0f1ec3..545a08b3f 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -18,7 +18,7 @@ jobs: fail-fast: true matrix: branch: - - master + - main - 2.15.x workflow: - ci.yml diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index eefa835dc..31281afac 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -25,9 +25,9 @@ Contributing Code and Bug Fixes To contribute code to ASDF please fork ASDF first and then open a pull request from your fork to ASDF. Typically, the main development work is done on the -"master" branch. The rest of the branches are for release maintenance and should +"main" branch. The rest of the branches are for release maintenance and should not be used normally. Unless otherwise told by a maintainer, pull request should -be made and submitted to the "master" branch. +be made and submitted to the "main" branch. .. note:: The "stable" branch is protected and used for official releases. diff --git a/README.rst b/README.rst index ef89042d7..24901fc10 100644 --- a/README.rst +++ b/README.rst @@ -18,7 +18,7 @@ ASDF - Advanced Scientific Data Format .. image:: https://readthedocs.org/projects/asdf/badge/?version=latest :target: https://asdf.readthedocs.io/en/latest/ -.. image:: https://codecov.io/gh/asdf-format/asdf/branch/master/graphs/badge.svg +.. image:: https://codecov.io/gh/asdf-format/asdf/branch/main/graphs/badge.svg :target: https://codecov.io/gh/asdf-format/asdf .. _begin-zenodo: @@ -288,7 +288,7 @@ can be installed using ``pip``: .. _begin-source-install-text: -The latest development version of ASDF is available from the ``master`` branch +The latest development version of ASDF is available from the ``main`` branch `on github `__. To clone the project: :: diff --git a/docs/asdf/developer_versioning.rst b/docs/asdf/developer_versioning.rst index 53c93e257..2625ce5b7 100644 --- a/docs/asdf/developer_versioning.rst +++ b/docs/asdf/developer_versioning.rst @@ -169,14 +169,14 @@ Update the asdf-standard submodule commit pointer ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The asdf-standard repository is integrated into the asdf repository -as a submodule. To pull in new commits from the remote master ( +as a submodule. To pull in new commits from the remote main ( assumed to be named ``origin``: .. code-block:: console $ cd asdf-standard $ git fetch origin - $ git checkout origin/master + $ git checkout origin/main Support the new standard version ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From 38db70e32965bd02f3825c86e79b34cf968267ee Mon Sep 17 00:00:00 2001 From: Brett Date: Mon, 13 Mar 2023 13:50:24 -0400 Subject: [PATCH 2/2] update changes --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index 78c8af71f..0bf07a9e7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -42,6 +42,7 @@ The ASDF Standard is at v1.6.0 - Add AsdfDeprecationWarning to asdf_extensions entry point [#1361] - Deprecate asdf.tests.helpers [#1440] - respect umask when determining file permissions for written files [#1451] +- rename master branch to main [#1479] 2.14.3 (2022-12-15) -------------------