From 1d2f311b1f41bd8e50deaeb774a2c761b775571b Mon Sep 17 00:00:00 2001
From: Florez Ospina Juan Felipe <juan.florez-ospina@psi.ch>
Date: Sun, 29 Jun 2025 08:47:29 +0200
Subject: [PATCH 1/2] Update README.md with conda forge instructions.

---
 README.md | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 40519a0..7ee914e 100644
--- a/README.md
+++ b/README.md
@@ -60,8 +60,11 @@ We recommend using Miniforge to manage your conda environments. Miniforge ensure
 
 1. Make sure you have installed **Miniforge**. 
 
-2. Create the Environment from `environment.yml`
-After installing Miniforge, open **Miniforge Prompt** or a terminal with access to conda and run:
+2. Open **Miniforge Prompt**
+    > ⚠️ Ensure your Conda base environment is from Miniforge (not Anaconda). Run `conda info` and check for `miniforge` in the base path and `conda-forge` as the default channel.
+
+
+3. Create the Environment from `environment.yml`. Inside the     **Miniforge Prompt** or a terminal with access to conda and run:
    ```bash
    cd path/to/Gitea/dima
    conda env create --file environment.yml
@@ -70,6 +73,16 @@ After installing Miniforge, open **Miniforge Prompt** or a terminal with access
    ```bash
    conda activate dima_env
    ```
+4. Remove the `defaults` channel (if present):
+   ```bash
+   conda config --remove channels defaults
+   ```
+5. Add `conda-forge` as the highest-priority channel:
+  ```bash
+  conda config --add channels conda-forge
+  conda config --set channel_priority strict
+  ```
+
 
 ### Working with Jupyter Notebooks
 We now make the previously installed Python environment `dima_env` selectable as a kernel in Jupyter's interface.

From 2a9e39b9ca16b372bf30bb99a93039626876f104 Mon Sep 17 00:00:00 2001
From: Florez Ospina Juan Felipe <juan.florez-ospina@psi.ch>
Date: Sun, 29 Jun 2025 08:51:32 +0200
Subject: [PATCH 2/2] update changelog for version v1.2.0

---
 CHANGELOG.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1fa752..afc99c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,4 +30,11 @@ Format based on [Keep a Changelog](https://keepachangelog.com) and [Semantic Ver
 - Include Licence
 
 ### Changed
-- Update README.md with new description + authors and funding sections
\ No newline at end of file
+- Update README.md with new description + authors and funding sections
+
+## [1.2.0] - 2025-06-29
+### Changed
+- Updated `README.md` to use Miniforge and `conda-forge` for environment setup.
+- Removed unreliable `setup_env.sh` shell-based installation instructions.
+- Added instructions to configure Conda to use only `conda-forge` with strict priority.
+- Included a notice to verify base environment origin via `conda info`.