From bfc0edf51aeed41d2c488ac6eaf18911a8d477aa Mon Sep 17 00:00:00 2001
From: Alessio Siniscalchi <a.siniscalchi@bopen.eu>
Date: Wed, 26 Jul 2023 10:53:31 +0200
Subject: [PATCH] template updated

---
 .cruft.json             | 2 +-
 .gitignore              | 3 +++
 .pre-commit-config.yaml | 8 ++++----
 Makefile                | 5 +++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.cruft.json b/.cruft.json
index 9496194..07e2586 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/ecmwf-projects/cookiecutter-conda-package",
-  "commit": "9627920059b31038e1bb8a978921806cb835fde7",
+  "commit": "46c5959d066cde32a3f39e51474fe8a058de4860",
   "checkout": null,
   "context": {
     "cookiecutter": {
diff --git a/.gitignore b/.gitignore
index c7d9595..46bc2fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,9 @@ version.py
 # Sphinx automatic generation of API
 docs/_api/
 
+# Combined environments
+ci/combined-environment-*.yml
+
 # Created by https://www.toptal.com/developers/gitignore/api/python,jupyternotebooks,vim,visualstudiocode,pycharm,emacs,linux,macos,windows
 # Edit at https://www.toptal.com/developers/gitignore?templates=python,jupyternotebooks,vim,visualstudiocode,pycharm,emacs,linux,macos,windows
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9d91575..1e90498 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 exclude: tests/data/
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.3.0
+  rev: v4.4.0
   hooks:
   - id: trailing-whitespace
   - id: end-of-file-fixer
@@ -12,7 +12,7 @@ repos:
   - id: debug-statements
   - id: mixed-line-ending
 - repo: https://github.com/psf/black
-  rev: 23.3.0
+  rev: 23.7.0
   hooks:
   - id: black
 - repo: https://github.com/keewis/blackdoc
@@ -21,7 +21,7 @@ repos:
   - id: blackdoc
     additional_dependencies: [black==22.3.0]
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.0.277
+  rev: v0.0.280
   hooks:
   - id: ruff
     args: [--fix, --show-fixes]
@@ -30,7 +30,7 @@ repos:
   hooks:
   - id: mdformat
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.9.0
+  rev: v2.10.0
   hooks:
   - id: pretty-format-yaml
     args: [--autofix, --preserve-quotes]
diff --git a/Makefile b/Makefile
index 9b17d33..4853701 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,9 @@ type-check:
 	python -m mypy .
 
 conda-env-update:
-	$(CONDA) env update $(CONDAFLAGS) -f ci/environment-ci.yml
-	$(CONDA) env update $(CONDAFLAGS) -f environment.yml
+	$(CONDA) install -y -c conda-forge conda-merge
+	$(CONDA) run conda-merge environment.yml ci/environment-ci.yml > ci/combined-environment-ci.yml
+	$(CONDA) env update $(CONDAFLAGS) -f ci/combined-environment-ci.yml
 
 docker-build:
 	docker build -t $(PROJECT) .