diff --git a/.github/workflows/mrd_conda.yml b/.github/workflows/mrd_conda.yml index 200b9a39..bd7ea31b 100644 --- a/.github/workflows/mrd_conda.yml +++ b/.github/workflows/mrd_conda.yml @@ -47,7 +47,7 @@ jobs: env: ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }} run: | - for p in $(find {cpp,python}/conda/build_pkg -name mrd*.tar.bz2) + for p in $(find {cpp,python}/conda/build_pkg -name 'mrd*.tar.bz2' -or -name 'mrd*.conda') do ./utils/conda/publish_package.sh -u ismrmrd -t "$ANACONDA_TOKEN" -p "$p" done diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml index 3c1df3f4..2eb15191 100644 --- a/python/conda/meta.yaml +++ b/python/conda/meta.yaml @@ -18,6 +18,7 @@ requirements: - pip run: - python + - ismrmrd-python >=1.14.2 - numpy >=1.22.0 - pillow >=9.2.0 @@ -26,6 +27,9 @@ test: - mrd - mrd.tools.phantom - mrd.tools.stream_recon + - mrd.tools.export_png_images + - mrd.tools.ismrmrd_to_mrd + - mrd.tools.mrd_to_ismrmrd about: home: https://ismrmrd.github.io/mrd diff --git a/python/conda/run_test.sh b/python/conda/run_test.sh index 4d1348ef..a07836fd 100755 --- a/python/conda/run_test.sh +++ b/python/conda/run_test.sh @@ -4,4 +4,10 @@ set -euo pipefail python -m mrd.tools.minimal_example -python -m mrd.tools.phantom | python -m mrd.tools.stream_recon | python -m mrd.tools.export_png_images +python -m mrd.tools.phantom \ + | python -m mrd.tools.mrd_to_ismrmrd \ + | python -m mrd.tools.ismrmrd_to_mrd \ + | python -m mrd.tools.stream_recon \ + | python -m mrd.tools.mrd_to_ismrmrd \ + | python -m mrd.tools.ismrmrd_to_mrd \ + | python -m mrd.tools.export_png_images \ diff --git a/python/pyproject.toml b/python/pyproject.toml index 1f9a1b7c..74fb8e59 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -8,7 +8,11 @@ packages = ["mrd", "mrd.tools"] [project] name = "mrd-python" dynamic = ["version"] -dependencies = ["numpy>=1.22.0", "pillow>=9.2.0"] +dependencies = [ + "ismrmrd>=1.14.2", + "numpy>=1.22.0", + "pillow>=9.2.0" +] requires-python = ">=3.12" description = "Library and tools for working with data in the ISMRM Raw Data (MRD) format." readme = "README.md"