Skip to content

Commit ff8479a

Browse files
Issue #1364 post release (#1365)
Fixes #1364 # Description - Adds installation instructions to release release candidate - Bump release candidate number, as combining release candidate labels and post-release labels is ill-advised by the python docs: > Creating post-releases of pre-releases is strongly discouraged, as it makes the version identifier difficult to parse for human readers. In general, it is substantially clearer to simply create a new pre-release by incrementing the numeric component. See https://packaging.python.org/en/latest/specifications/version-specifiers/#pre-releases
1 parent 472f1b4 commit ff8479a

File tree

5 files changed

+36
-5
lines changed

5 files changed

+36
-5
lines changed

docs/api/changelog.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@ All notable changes to this project will be documented in this file.
66
The format is based on `Keep a Changelog`_, and this project adheres to
77
`Semantic Versioning`_.
88

9+
[1.0.0rc1] - 2024-12-20
10+
-----------------------
11+
12+
Small post-release fix for installation instructions in documentation.
13+
914
[1.0.0rc0] - 2024-12-20
10-
----------------------
15+
-----------------------
1116

1217
Added
1318
~~~~~

docs/developing/releasing.rst

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,29 @@ The TeamCity pipeline will:
2525

2626
1. Create a release on GitHub
2727
2. Create the imod-python package and upload it to PyPi
28-
3. Build the documentation and deploy it
28+
3. Build the documentation and deploy it
29+
30+
The release is now available on PyPi but not yet on conda-forge. The conda-forge
31+
bot will automatically open a PR to update `the imod feedstock.
32+
<https://github.com/conda-forge/imod-feedstock>`_ It usually takes a few hours
33+
before the bot opens a PR. This PR will be reviewed by the imod-feedstock
34+
maintainers and merged if everything is in order.
35+
36+
Release a pre-release
37+
^^^^^^^^^^^^^^^^^^^^^
38+
39+
To release a pre-release, follow the same steps as above, but add a ``rc`` to the
40+
version + a build number. For example: ``1.0.0rc0`` for the first release candidate.
41+
42+
PyPI will automatically recognize this as a pre-release, thus will not show it
43+
as a stable build. To get the pre-release on conda-forge, you need to:
44+
45+
1. Fork `the imod-feedstock <https://github.com/conda-forge/imod-feedstock>`_
46+
2. Checkout the ``rc`` branch of the imod-feedstock
47+
3. Update the version in the ``recipe/meta.yaml`` file to the pre-release version, e.g. ``1.0.0rc0``
48+
4. Update the sha256 checksum in the ``recipe/meta.yaml`` file, you can generate one by running:
49+
``curl -sL https://pypi.io/packages/source/i/imod/imod-{{version}}.tar.gz | openssl sha256``
50+
(TIP: On Windows, you can install curl and openssl via pixi)
51+
5. Commit and push the changes to your fork
52+
6. Open a PR to the imod-feedstock and make sure it merges to the ``rc`` branch.
53+
7. This will trigger a few CI jobs. When these succeed, the branch can be merged.

docs/installation.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ Install beta release
2828

2929
To install a beta release with pixi::
3030

31+
pixi config prepend default-channels "conda-forge/label/imod_rc"
3132
pixi add imod=1.0.0rc0
3233

3334
Or with conda::
3435

35-
conda install imod=1.0.0rc0
36+
conda install -c conda-forge/label/imod_rc -c conda-forge imod=1.0.0rc0
3637

3738
Or with pip::
3839

imod/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
)
1616
from imod.formats import gen, idf, ipf, prj, rasterio
1717

18-
__version__ = "1.0.0rc0"
18+
__version__ = "1.0.0rc1"

pixi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "imod-python"
3-
version = "1.0.0rc0"
3+
version = "1.0.0rc1"
44
description = "Make massive MODFLOW models"
55
authors = ["Deltares <imod.info@deltares.nl>"]
66
channels = ["conda-forge"]

0 commit comments

Comments
 (0)