From a9a8292868ec5d0f259820b7468c71153c71b05b Mon Sep 17 00:00:00 2001 From: Bartosz Date: Mon, 7 Sep 2026 16:26:02 +0200 Subject: [PATCH] Use main as the default branch. --- .github/workflows/lint.yml | 2 +- .github/workflows/specs.yml | 2 +- CHANGELOG.rst | 4 ++-- README.rst | 4 ++-- RELEASING.rst | 17 ++++++++--------- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e22c0f4..85680a5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -2,7 +2,7 @@ name: Lint on: push: - branches: [master, develop] + branches: [main] pull_request: jobs: diff --git a/.github/workflows/specs.yml b/.github/workflows/specs.yml index cd07851..786a53f 100644 --- a/.github/workflows/specs.yml +++ b/.github/workflows/specs.yml @@ -2,7 +2,7 @@ name: Specs on: push: - branches: [master, develop] + branches: [main] pull_request: jobs: diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9d24834..78c409d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,5 @@ -master ------- +Unreleased +---------- 7.3.0 (2026-09-07) ------------------ diff --git a/README.rst b/README.rst index a45dc00..280daf3 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ Python SDK for Castle ===================== -.. image:: https://github.com/castle/castle-python/actions/workflows/specs.yml/badge.svg?branch=master +.. image:: https://github.com/castle/castle-python/actions/workflows/specs.yml/badge.svg?branch=main :alt: Build Status :target: https://github.com/castle/castle-python/actions/workflows/specs.yml @@ -195,4 +195,4 @@ All exceptions inherit from ``CastleError``. The most useful ones: - ``InternalServerError`` — 5xx response from Castle - ``WebhookVerificationError`` — webhook signature did not match -The full list is in `castle/errors.py `_. +The full list is in `castle/errors.py `_. diff --git a/RELEASING.rst b/RELEASING.rst index 8e018e0..ce2d9b0 100644 --- a/RELEASING.rst +++ b/RELEASING.rst @@ -1,20 +1,19 @@ Releasing ========= -#. Create release branch ``X.Y.Z`` from ``develop``. +#. Create release branch ``X.Y.Z`` from ``main``. #. Update ``VERSION`` in ``castle/version.py`` to the new version. #. Update ``CHANGELOG.rst`` for the impending release. #. ``git commit -am "release X.Y.Z"`` (where ``X.Y.Z`` is the new version). -#. Push to GitHub, open a PR to ``develop``, and merge when approved. -#. On ``develop``: run ``make test`` and ``make lint`` (or confirm CI is green). -#. Pull latest ``develop``, merge into ``master``, and **push ``master`` to ``origin``**. -#. Create a GitHub release from ``master`` with tag ``vX.Y.Z`` (see below). -#. Publish to PyPI from ``master`` (see below). A GitHub release does **not** publish the package; PyPI is updated only via ``twine upload``. +#. Push to GitHub, open a PR to ``main``, and merge when approved. +#. On ``main``: run ``make test`` and ``make lint`` (or confirm CI is green). +#. Create a GitHub release from ``main`` with tag ``vX.Y.Z`` (see below). +#. Publish to PyPI from ``main`` (see below). A GitHub release does **not** publish the package; PyPI is updated only via ``twine upload``. GitHub release -------------- -Create the release only after ``master`` on ``origin`` contains the release commit. +Create the release only after ``main`` on ``origin`` contains the release commit. .. code-block:: console @@ -27,11 +26,11 @@ Use ``--latest`` as a separate flag if you need to mark the release as Latest; d PyPI ---- -From a clean checkout of ``master`` at the release commit: +From a clean checkout of ``main`` at the release commit: .. code-block:: console - git checkout master && git pull + git checkout main && git pull rm -rf dist build pip install build twine python3 -m build