From d14709ec24514155e2eda2fd9ad980b41fb730a5 Mon Sep 17 00:00:00 2001
From: Joe Naegele <v-jnaegele@microsoft.com>
Date: Sat, 23 Nov 2024 03:18:15 +0000
Subject: [PATCH] Support newer versions of ISMRMRD in mrd-tools

---
 VERSION             | 2 +-
 cpp/conda/meta.yaml | 4 ++--
 environment.yml     | 2 +-
 justfile            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index 7ec1d6d..3e3c2f1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0
+2.1.1
diff --git a/cpp/conda/meta.yaml b/cpp/conda/meta.yaml
index 372fa58..a2b8948 100644
--- a/cpp/conda/meta.yaml
+++ b/cpp/conda/meta.yaml
@@ -22,7 +22,7 @@ requirements:
     - howardhinnant_date=3.0.1
     - hdf5=1.10.6
     - imagemagick=7.0.11_13
-    - ismrmrd=1.13.7
+    - ismrmrd>=1.14.2
     - nlohmann_json=3.11.2
     - xtensor=0.24.7
     - xtensor-fftw=0.2.5
@@ -30,7 +30,7 @@ requirements:
     - fmt=8.1.1
     - hdf5=1.10.6
     - imagemagick=7.0.11_13
-    - ismrmrd=1.13.7
+    - ismrmrd>=1.14.2
     - fftw=3.3.9
 
 about:
diff --git a/environment.yml b/environment.yml
index 1b411b3..153ce54 100644
--- a/environment.yml
+++ b/environment.yml
@@ -15,7 +15,7 @@ dependencies:
   - hdf5=1.10.6
   - imagemagick=7.0.11_13
   - ipykernel=6.23.1
-  - ismrmrd=1.13.7
+  - ismrmrd>=1.14.2
   - howardhinnant_date=3.0.1
   - just=1.5.0
   - matplotlib=3.6.2
diff --git a/justfile b/justfile
index 4b2a0fa..e5f2230 100644
--- a/justfile
+++ b/justfile
@@ -20,7 +20,7 @@ cross-recon-test-cmd := if matlab != "disabled" { "MRD_MATLAB_ENABLED=true ./tes
     cmake -GNinja \
         -D CMAKE_BUILD_TYPE={{ build_type }} \
         -D CMAKE_CXX_STANDARD={{ cpp_version }} \
-        -D CMAKE_INSTALL_PREFIX=$(mamba info --json | jq -r .default_prefix) \
+        -D CMAKE_INSTALL_PREFIX=$(conda info --json | jq -r .default_prefix) \
         ..
 
 @build: configure generate