Update CONTRIBUTING.rst

mods for Github workflow -> PyPi release handling

Author: fs446

CONTRIBUTING.rst

@@ -62,22 +62,39 @@ whatever you need with ``uv run``.
 Creating a New Release
 ^^^^^^^^^^^^^^^^^^^^^^
 
-New releases are made using the following steps:
+It is proposed to perform these steps for creating a new release:
 
 #. Bump version number in ``sfs/__init__.py``
 #. Update ``NEWS.rst``
 #. Commit those changes as "Release x.y.z"
 #. Create an (annotated) tag with ``git tag -a x.y.z``
-#. Clear the ``dist/`` directory
-#. Create a source distribution with ``python3 setup.py sdist``
-#. Create a wheel distribution with ``python3 setup.py bdist_wheel``
-#. Check that both files have the correct content
-#. Upload them to PyPI_ with twine_: ``python3 -m twine upload dist/*``
-#. Push the commit and the tag to Github and `add release notes`_ containing a
-   link to PyPI and the bullet points from ``NEWS.rst``
+#. Push the commit and the tag to Github
+#. Github workflow publish.yml will handle the build and upload to PyPi
+#. `Add release notes`_ containing a link to PyPI and the bullet points
+   from ``NEWS.rst``
 #. Check that the new release was built correctly on RTD_
-   and select the new release as default version
+   and select the new release as the default version
+
+Alternatively, an extra branch and PR can be utilised as follows:
+
+#. Create a branch from the current master branch state. In this new branch:
+#. Bump version number in ``sfs/__init__.py``
+#. Update ``NEWS.rst``
+#. Commit those changes as "Release x.y.z", push this commit and make a PR.
+   This will trigger workflows to check that everything is fine, the PR is a
+   nice additional documentation of this release process.
+#. Create an (annotated) tag with ``git tag -a x.y.z`` and push it
+#. Due to this tag push Github workflow publish.yml will handle the build
+   and upload to PyPi
+#. Merge the PR by ``git merge branch_name --ff-only``. This is needed for
+   preserving the release and tag commits as they need to appear exactly this
+   way in the master branch history.
+#. Delete the branch
+#. `Add release notes`_ containing a link to PyPI and the bullet points
+   from ``NEWS.rst``
+#. Check that the new release was built correctly on RTD_
+   and select the new release as the default version
+
 
-.. _twine: https://twine.readthedocs.io/
 .. _add release notes: https://github.com/sfstoolbox/sfs-python/tags
 .. _RTD: https://readthedocs.org/projects/sfs-python/builds/