From ca6943f19c3734368a2d2cca32f63aef30fae7eb Mon Sep 17 00:00:00 2001 From: Hem-W Date: Thu, 27 Feb 2025 13:02:42 +0800 Subject: [PATCH 1/4] fix bugs in env creation of contribution guide --- CONTRIBUTING.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index e6603e79b..48c98f635 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -124,8 +124,9 @@ Ready to contribute? Here's how to set up `xclim` for local development. .. code-block:: shell - conda create -n xclim python=3.10 --file=environment.yml - python -m pip install -e --no-deps . + conda env create --file environment.yml + conda activate xclim + python -m pip install -e . --no-deps #. Create a branch for local development: From a26668a13943ffb850c0d11b1485e5405a02aa61 Mon Sep 17 00:00:00 2001 From: Hem-W Date: Thu, 27 Feb 2025 13:21:22 +0800 Subject: [PATCH 2/4] update changelog --- CHANGELOG.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index cf032c82b..f201dd671 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,7 +4,11 @@ Changelog v0.56.0 (unreleased) -------------------- -Contributors to this version: Trevor James Smith (:user:`Zeitsperre`). +Contributors to this version: Trevor James Smith (:user:`Zeitsperre`), Hui-Min Wang (:user:`Hem-W`). + +Bug fixes +^^^^^^^^^ +* Fixed installation instructions in the Contributing guide. Breaking changes ^^^^^^^^^^^^^^^^ From 63379779d30607bf04f786f6a960b804b91ce093 Mon Sep 17 00:00:00 2001 From: Hem-W Date: Thu, 27 Feb 2025 13:27:48 +0800 Subject: [PATCH 3/4] update changelog --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f201dd671..a64a62afa 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,7 +8,7 @@ Contributors to this version: Trevor James Smith (:user:`Zeitsperre`), Hui-Min W Bug fixes ^^^^^^^^^ -* Fixed installation instructions in the Contributing guide. +* Fix installation instructions in the Contributing guide (:issue:`2088`, :pull:`2089`). Breaking changes ^^^^^^^^^^^^^^^^ From 1eaa9539490d74eb33da7eb7c623d06de626ab48 Mon Sep 17 00:00:00 2001 From: Pascal Bourgault Date: Thu, 27 Feb 2025 09:42:05 -0500 Subject: [PATCH 4/4] Update installation.rst removing explicit python version here too --- docs/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.rst b/docs/installation.rst index d045b99fa..3a6c396af 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -158,6 +158,6 @@ To create a conda environment including `xclim`'s dependencies and several optio .. code-block:: console - conda env create -n my_xclim_env python=3.10 --file=environment.yml + conda env create -n my_xclim_env --file=environment.yml conda activate my_xclim_env (my_xclim_env) python -m pip install --no-deps -e .