From 399b88704cd5bb35c2f673687f6106233595d55d Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Thu, 7 Dec 2023 10:27:49 +0000 Subject: [PATCH 01/12] Add recipes for dmri-dicelib and dmri-amico --- recipes/dmri-amico/build.sh | 8 +++++ recipes/dmri-amico/meta.yaml | 58 ++++++++++++++++++++++++++++++++++ recipes/dmri-dicelib/meta.yaml | 55 ++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 recipes/dmri-amico/build.sh create mode 100644 recipes/dmri-amico/meta.yaml create mode 100644 recipes/dmri-dicelib/meta.yaml diff --git a/recipes/dmri-amico/build.sh b/recipes/dmri-amico/build.sh new file mode 100644 index 0000000000000..852c9cc0ce760 --- /dev/null +++ b/recipes/dmri-amico/build.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +echo "[openblas]" >> site.cfg +echo "library = blas" >> site.cfg +echo "library_dir = $PREFIX/lib" >> site.cfg +echo "include_dir = $PREFIX/include" >> site.cfg + +${PYTHON} -m pip install . --no-deps -vv diff --git a/recipes/dmri-amico/meta.yaml b/recipes/dmri-amico/meta.yaml new file mode 100644 index 0000000000000..46344f176524d --- /dev/null +++ b/recipes/dmri-amico/meta.yaml @@ -0,0 +1,58 @@ +{% set name = "dmri-amico" %} +{% set version = "2.0.1" %} +{% set sha256 = "08fe9fe14554656fcfe9862dcdbb40f5cf9fc1cb9af5685435190110b83f1902" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + fn: {{ name }}-{{ version }}.tar.gz + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz + sha256: {{ sha256 }} + +build: + number: 0 + +requirements: + build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - python # [build_platform != target_platform] + - cython # [build_platform != target_platform] + host: + - cython + - libblas + - liblapack + - python + - pip + - spams-cython + run: + - dipy + - dmri-dicelib + - python + - numpy + - scipy + - threadpoolctl + +test: + imports: + - amico + requires: + - pip + commands: + - pip check + - python -c "import amico; amico.setup()" + +about: + home: https://pypi.org/project/dmri-amico/ + license_file: LICENSE + summary: Implementation of the linear framework for Accelerated Microstructure Imaging via Convex Optimization (AMICO) described in Daducci, Alessandro, et al. 2015 + dev_url: https://github.com/daducci/AMICO/ + +extra: + recipe-maintainers: + - daducci + - nightwnvol + - pauldmccarthy \ No newline at end of file diff --git a/recipes/dmri-dicelib/meta.yaml b/recipes/dmri-dicelib/meta.yaml new file mode 100644 index 0000000000000..f22a3c7fe1369 --- /dev/null +++ b/recipes/dmri-dicelib/meta.yaml @@ -0,0 +1,55 @@ +{% set name = "dmri-dicelib" %} +{% set version = "1.0.3" %} +{% set sha256 = "5a2e315e2bebed0cbf19e300a2328827903d77086824ae8f04b0410f65585cc2" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + fn: {{ name }}-{{ version }}.tar.gz + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz + sha256: {{ sha256 }} + +build: + number: 0 + script: {{ PYTHON }} -m pip install . --no-deps -vv + +requirements: + build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - python # [build_platform != target_platform] + - cython # [build_platform != target_platform] + - numpy # [build_platform != target_platform] + host: + - cython + - numpy + - pip + - python + run: + - dipy + - {{ pin_compatible('numpy') }} + - python + - scipy + +test: + imports: + - dicelib + requires: + - pip + commands: + - pip check + +about: + home: https://pypi.org/project/dmri-dicelib/ + license_file: LICENSE + summary: Various algorithms developed by the DICE lab to process/manipulate diffusion MRI objects, e.g. streamlines, tractograms etc. + dev_url: https://pypi.org/project/dmri-dicelib/ + +extra: + recipe-maintainers: + - daducci + - nightwnvol + - pauldmccarthy From b55b71d39e591f6ef6b9ec9a9eb7dfcc79e1fb97 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Thu, 7 Dec 2023 10:53:10 +0000 Subject: [PATCH 02/12] FIx formatting, add license field --- recipes/dmri-amico/meta.yaml | 9 +++++---- recipes/dmri-dicelib/meta.yaml | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/recipes/dmri-amico/meta.yaml b/recipes/dmri-amico/meta.yaml index 46344f176524d..b3698fbdf22de 100644 --- a/recipes/dmri-amico/meta.yaml +++ b/recipes/dmri-amico/meta.yaml @@ -18,9 +18,9 @@ requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - cross-python_{{ target_platform }} # [build_platform != target_platform] - - python # [build_platform != target_platform] - - cython # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - python # [build_platform != target_platform] + - cython # [build_platform != target_platform] host: - cython - libblas @@ -47,6 +47,7 @@ test: about: home: https://pypi.org/project/dmri-amico/ + license: LicenseRef-DICE-lab license_file: LICENSE summary: Implementation of the linear framework for Accelerated Microstructure Imaging via Convex Optimization (AMICO) described in Daducci, Alessandro, et al. 2015 dev_url: https://github.com/daducci/AMICO/ @@ -55,4 +56,4 @@ extra: recipe-maintainers: - daducci - nightwnvol - - pauldmccarthy \ No newline at end of file + - pauldmccarthy diff --git a/recipes/dmri-dicelib/meta.yaml b/recipes/dmri-dicelib/meta.yaml index f22a3c7fe1369..0043d3a78f411 100644 --- a/recipes/dmri-dicelib/meta.yaml +++ b/recipes/dmri-dicelib/meta.yaml @@ -19,10 +19,10 @@ requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - cross-python_{{ target_platform }} # [build_platform != target_platform] - - python # [build_platform != target_platform] - - cython # [build_platform != target_platform] - - numpy # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - python # [build_platform != target_platform] + - cython # [build_platform != target_platform] + - numpy # [build_platform != target_platform] host: - cython - numpy @@ -44,6 +44,7 @@ test: about: home: https://pypi.org/project/dmri-dicelib/ + license: LicenseRef-DICE-lab license_file: LICENSE summary: Various algorithms developed by the DICE lab to process/manipulate diffusion MRI objects, e.g. streamlines, tractograms etc. dev_url: https://pypi.org/project/dmri-dicelib/ From e4673b9fc0ecccde28543a1890fcb0d33f1a1648 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Thu, 7 Dec 2023 10:54:32 +0000 Subject: [PATCH 03/12] Remove pip check test, as it complains about cython --- recipes/dmri-amico/meta.yaml | 3 --- recipes/dmri-dicelib/meta.yaml | 4 ---- 2 files changed, 7 deletions(-) diff --git a/recipes/dmri-amico/meta.yaml b/recipes/dmri-amico/meta.yaml index b3698fbdf22de..00a1a5e0d3f11 100644 --- a/recipes/dmri-amico/meta.yaml +++ b/recipes/dmri-amico/meta.yaml @@ -39,10 +39,7 @@ requirements: test: imports: - amico - requires: - - pip commands: - - pip check - python -c "import amico; amico.setup()" about: diff --git a/recipes/dmri-dicelib/meta.yaml b/recipes/dmri-dicelib/meta.yaml index 0043d3a78f411..eac93edb331d0 100644 --- a/recipes/dmri-dicelib/meta.yaml +++ b/recipes/dmri-dicelib/meta.yaml @@ -37,10 +37,6 @@ requirements: test: imports: - dicelib - requires: - - pip - commands: - - pip check about: home: https://pypi.org/project/dmri-dicelib/ From 12303823d7fcf8c14536c1552d1b48ae11549630 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Thu, 7 Dec 2023 12:47:19 +0000 Subject: [PATCH 04/12] There seems to be a compatibility issue with h5py and numpy; attempting to work around this by pinning numpy at build/run time --- recipes/dmri-amico/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/dmri-amico/meta.yaml b/recipes/dmri-amico/meta.yaml index 00a1a5e0d3f11..bafef6ec37bd8 100644 --- a/recipes/dmri-amico/meta.yaml +++ b/recipes/dmri-amico/meta.yaml @@ -21,6 +21,7 @@ requirements: - cross-python_{{ target_platform }} # [build_platform != target_platform] - python # [build_platform != target_platform] - cython # [build_platform != target_platform] + - numpy # [build_platform != target_platform] host: - cython - libblas @@ -32,7 +33,7 @@ requirements: - dipy - dmri-dicelib - python - - numpy + - {{ pin_compatible('numpy') }} - scipy - threadpoolctl From ebb46c09aa1aba9d1de292a545e5e74f580916c4 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Thu, 7 Dec 2023 15:26:24 +0000 Subject: [PATCH 05/12] Remove support for cross-compilation to see if it resolves weird h5py pinning issue --- recipes/dmri-amico/meta.yaml | 8 +++----- recipes/dmri-dicelib/meta.yaml | 7 +++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/recipes/dmri-amico/meta.yaml b/recipes/dmri-amico/meta.yaml index bafef6ec37bd8..eead33e6bb60f 100644 --- a/recipes/dmri-amico/meta.yaml +++ b/recipes/dmri-amico/meta.yaml @@ -18,10 +18,8 @@ requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - cross-python_{{ target_platform }} # [build_platform != target_platform] - - python # [build_platform != target_platform] - - cython # [build_platform != target_platform] - - numpy # [build_platform != target_platform] + - python + - cython host: - cython - libblas @@ -33,7 +31,7 @@ requirements: - dipy - dmri-dicelib - python - - {{ pin_compatible('numpy') }} + - numpy - scipy - threadpoolctl diff --git a/recipes/dmri-dicelib/meta.yaml b/recipes/dmri-dicelib/meta.yaml index eac93edb331d0..8bb320c2be91c 100644 --- a/recipes/dmri-dicelib/meta.yaml +++ b/recipes/dmri-dicelib/meta.yaml @@ -19,10 +19,9 @@ requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - cross-python_{{ target_platform }} # [build_platform != target_platform] - - python # [build_platform != target_platform] - - cython # [build_platform != target_platform] - - numpy # [build_platform != target_platform] + - python + - cython + - numpy host: - cython - numpy From b0024572a3bf38787942679d2686b3644d567dcd Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Fri, 8 Dec 2023 09:56:18 +0000 Subject: [PATCH 06/12] Pin h5py to try and work around weird unrelated incompaitility --- recipes/dmri-amico/meta.yaml | 1 + recipes/dmri-dicelib/meta.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/recipes/dmri-amico/meta.yaml b/recipes/dmri-amico/meta.yaml index eead33e6bb60f..dff996880b564 100644 --- a/recipes/dmri-amico/meta.yaml +++ b/recipes/dmri-amico/meta.yaml @@ -30,6 +30,7 @@ requirements: run: - dipy - dmri-dicelib + - h5py >=3 - python - numpy - scipy diff --git a/recipes/dmri-dicelib/meta.yaml b/recipes/dmri-dicelib/meta.yaml index 8bb320c2be91c..bf25baaddeed4 100644 --- a/recipes/dmri-dicelib/meta.yaml +++ b/recipes/dmri-dicelib/meta.yaml @@ -29,6 +29,7 @@ requirements: - python run: - dipy + - h5py >=3 - {{ pin_compatible('numpy') }} - python - scipy From bbba4eced39450db3a130fe1bfb8532d1d35645a Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Fri, 8 Dec 2023 12:02:06 +0000 Subject: [PATCH 07/12] Add Windows build file --- recipes/dmri-amico/bld.bat | 6 ++++++ recipes/dmri-amico/build.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 recipes/dmri-amico/bld.bat diff --git a/recipes/dmri-amico/bld.bat b/recipes/dmri-amico/bld.bat new file mode 100644 index 0000000000000..723d8ea4b0086 --- /dev/null +++ b/recipes/dmri-amico/bld.bat @@ -0,0 +1,6 @@ +echo "[openblas]" >> site.cfg +echo "library = blas" >> site.cfg +echo "library_dir = $PREFIX/lib" >> site.cfg +echo "include_dir = $PREFIX/include" >> site.cfg + +"%PYTHON%" -m pip install --no-deps --ignore-installed . diff --git a/recipes/dmri-amico/build.sh b/recipes/dmri-amico/build.sh index 852c9cc0ce760..9cb881246dee7 100644 --- a/recipes/dmri-amico/build.sh +++ b/recipes/dmri-amico/build.sh @@ -2,7 +2,7 @@ echo "[openblas]" >> site.cfg echo "library = blas" >> site.cfg -echo "library_dir = $PREFIX/lib" >> site.cfg -echo "include_dir = $PREFIX/include" >> site.cfg +echo "library_dir = $PREFIX\lib" >> site.cfg +echo "include_dir = $PREFIX\include" >> site.cfg ${PYTHON} -m pip install . --no-deps -vv From 620d05b069eea5ed9ac2a2d9c536ba839440ef3a Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Fri, 8 Dec 2023 13:18:37 +0000 Subject: [PATCH 08/12] Fix build files. Jeez, windows is so literal --- recipes/dmri-amico/bld.bat | 8 ++++---- recipes/dmri-amico/build.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/dmri-amico/bld.bat b/recipes/dmri-amico/bld.bat index 723d8ea4b0086..7de9926962b8a 100644 --- a/recipes/dmri-amico/bld.bat +++ b/recipes/dmri-amico/bld.bat @@ -1,6 +1,6 @@ -echo "[openblas]" >> site.cfg -echo "library = blas" >> site.cfg -echo "library_dir = $PREFIX/lib" >> site.cfg -echo "include_dir = $PREFIX/include" >> site.cfg +echo [openblas] >> site.cfg +echo library = blas >> site.cfg +echo library_dir = "%PREFIX%"\lib >> site.cfg +echo include_dir = "%PREFIX%"\include >> site.cfg "%PYTHON%" -m pip install --no-deps --ignore-installed . diff --git a/recipes/dmri-amico/build.sh b/recipes/dmri-amico/build.sh index 9cb881246dee7..852c9cc0ce760 100644 --- a/recipes/dmri-amico/build.sh +++ b/recipes/dmri-amico/build.sh @@ -2,7 +2,7 @@ echo "[openblas]" >> site.cfg echo "library = blas" >> site.cfg -echo "library_dir = $PREFIX\lib" >> site.cfg -echo "include_dir = $PREFIX\include" >> site.cfg +echo "library_dir = $PREFIX/lib" >> site.cfg +echo "include_dir = $PREFIX/include" >> site.cfg ${PYTHON} -m pip install . --no-deps -vv From dbc66ec9ada3adf7d230b26db5e013501522dbad Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Mon, 11 Dec 2023 16:15:25 +0000 Subject: [PATCH 09/12] Allow blas/lapack libs to be specified separately --- recipes/dmri-amico/bld.bat | 9 +++++++-- recipes/dmri-amico/build.sh | 6 +++++- recipes/dmri-amico/meta.yaml | 2 ++ recipes/dmri-amico/setup.py.patch | 27 +++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 recipes/dmri-amico/setup.py.patch diff --git a/recipes/dmri-amico/bld.bat b/recipes/dmri-amico/bld.bat index 7de9926962b8a..ec2c7b6ec5bb6 100644 --- a/recipes/dmri-amico/bld.bat +++ b/recipes/dmri-amico/bld.bat @@ -1,6 +1,11 @@ -echo [openblas] >> site.cfg +echo [blas] >> site.cfg echo library = blas >> site.cfg -echo library_dir = "%PREFIX%"\lib >> site.cfg +echo library_dir = "%PREFIX%"\Library\lib >> site.cfg +echo include_dir = "%PREFIX%"\include >> site.cfg + +echo [lapack] >> site.cfg +echo library = lapack >> site.cfg +echo library_dir = "%PREFIX%"\Library\lib >> site.cfg echo include_dir = "%PREFIX%"\include >> site.cfg "%PYTHON%" -m pip install --no-deps --ignore-installed . diff --git a/recipes/dmri-amico/build.sh b/recipes/dmri-amico/build.sh index 852c9cc0ce760..f1ceaf2d8d618 100644 --- a/recipes/dmri-amico/build.sh +++ b/recipes/dmri-amico/build.sh @@ -1,8 +1,12 @@ #!/usr/bin/env bash -echo "[openblas]" >> site.cfg +echo "[blas]" >> site.cfg echo "library = blas" >> site.cfg echo "library_dir = $PREFIX/lib" >> site.cfg echo "include_dir = $PREFIX/include" >> site.cfg +echo "[lapack]" >> site.cfg +echo "library = lapack" >> site.cfg +echo "library_dir = $PREFIX/lib" >> site.cfg +echo "include_dir = $PREFIX/include" >> site.cfg ${PYTHON} -m pip install . --no-deps -vv diff --git a/recipes/dmri-amico/meta.yaml b/recipes/dmri-amico/meta.yaml index dff996880b564..69d8d4e199c51 100644 --- a/recipes/dmri-amico/meta.yaml +++ b/recipes/dmri-amico/meta.yaml @@ -10,6 +10,8 @@ source: fn: {{ name }}-{{ version }}.tar.gz url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz sha256: {{ sha256 }} + patches: + - setup.py.patch build: number: 0 diff --git a/recipes/dmri-amico/setup.py.patch b/recipes/dmri-amico/setup.py.patch new file mode 100644 index 0000000000000..8cb5416cc1829 --- /dev/null +++ b/recipes/dmri-amico/setup.py.patch @@ -0,0 +1,27 @@ +diff --git a/setup.py b/setup.py +index 1c5ed51b..43583678 100644 +--- a/setup.py ++++ b/setup.py +@@ -25,13 +25,15 @@ if not isfile('site.cfg'): + exit(1) + config = ConfigParser() + config.read('site.cfg') +-try: +- libraries.extend([config['openblas']['library']]) +- library_dirs.extend([config['openblas']['library_dir']]) +- include_dirs.extend([config['openblas']['include_dir']]) +-except KeyError as err: +- print(f'\033[31mKeyError: cannot find the {err} key in the site.cfg file. See the site.cfg.example file for documentation\033[0m') +- exit(1) ++ ++for lib in ('blas', 'lapack', 'openblas'): ++ if lib in config: ++ libraries.extend([config[lib]['library']]) ++ library_dirs.extend([config[lib]['library_dir']]) ++ include_dirs.extend([config[lib]['include_dir']]) ++if len(libraries) == 0: ++ print(f'\033[31mKeyError: cannot find LAPACK/BLAS/OpenBLAS paths in the site.cfg file. See the site.cfg.example file for documentation\033[0m') ++ exit(1) + + if sys.platform.startswith('win32'): + extra_compile_args.extend(['/std:c++14', '/fp:fast']) From f4a4ddf0fef242315b899b5ef861aa63783f873b Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Tue, 12 Dec 2023 09:14:06 +0000 Subject: [PATCH 10/12] Add back in cross-compile capability --- recipes/dmri-amico/meta.yaml | 5 +++-- recipes/dmri-dicelib/meta.yaml | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/recipes/dmri-amico/meta.yaml b/recipes/dmri-amico/meta.yaml index 69d8d4e199c51..7b830ed293603 100644 --- a/recipes/dmri-amico/meta.yaml +++ b/recipes/dmri-amico/meta.yaml @@ -20,8 +20,9 @@ requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - python - - cython + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - python # [build_platform != target_platform] + - cython # [build_platform != target_platform] host: - cython - libblas diff --git a/recipes/dmri-dicelib/meta.yaml b/recipes/dmri-dicelib/meta.yaml index bf25baaddeed4..a8e849700d7f9 100644 --- a/recipes/dmri-dicelib/meta.yaml +++ b/recipes/dmri-dicelib/meta.yaml @@ -19,9 +19,10 @@ requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - python - - cython - - numpy + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - python # [build_platform != target_platform] + - cython # [build_platform != target_platform] + - numpy # [build_platform != target_platform] host: - cython - numpy From 57e6ce6396595acc72615362615e8c19922ffcc6 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Wed, 13 Dec 2023 21:55:20 +0000 Subject: [PATCH 11/12] Don't use sha256 jinja var. Explanation for setup.py.patch --- recipes/dmri-amico/meta.yaml | 7 +++++-- recipes/dmri-dicelib/meta.yaml | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes/dmri-amico/meta.yaml b/recipes/dmri-amico/meta.yaml index 7b830ed293603..2b7b072a53226 100644 --- a/recipes/dmri-amico/meta.yaml +++ b/recipes/dmri-amico/meta.yaml @@ -1,6 +1,5 @@ {% set name = "dmri-amico" %} {% set version = "2.0.1" %} -{% set sha256 = "08fe9fe14554656fcfe9862dcdbb40f5cf9fc1cb9af5685435190110b83f1902" %} package: name: {{ name|lower }} @@ -9,7 +8,11 @@ package: source: fn: {{ name }}-{{ version }}.tar.gz url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: {{ sha256 }} + sha256: 08fe9fe14554656fcfe9862dcdbb40f5cf9fc1cb9af5685435190110b83f1902 + + # allow separate libraries for lapack / blas, rather than + # assuming a single library, i.e. openblas, for both. See + # https://github.com/daducci/AMICO/pull/179 patches: - setup.py.patch diff --git a/recipes/dmri-dicelib/meta.yaml b/recipes/dmri-dicelib/meta.yaml index a8e849700d7f9..77e8c97c41458 100644 --- a/recipes/dmri-dicelib/meta.yaml +++ b/recipes/dmri-dicelib/meta.yaml @@ -1,6 +1,5 @@ {% set name = "dmri-dicelib" %} {% set version = "1.0.3" %} -{% set sha256 = "5a2e315e2bebed0cbf19e300a2328827903d77086824ae8f04b0410f65585cc2" %} package: name: {{ name|lower }} @@ -9,7 +8,7 @@ package: source: fn: {{ name }}-{{ version }}.tar.gz url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: {{ sha256 }} + sha256: 5a2e315e2bebed0cbf19e300a2328827903d77086824ae8f04b0410f65585cc2 build: number: 0 From f773e50383bee908ab9b9080b393f9b80b855be2 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Thu, 18 Jan 2024 08:35:32 +0000 Subject: [PATCH 12/12] Remove unused fn fields --- recipes/dmri-amico/meta.yaml | 1 - recipes/dmri-dicelib/meta.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/recipes/dmri-amico/meta.yaml b/recipes/dmri-amico/meta.yaml index 2b7b072a53226..7d273d6ba23ab 100644 --- a/recipes/dmri-amico/meta.yaml +++ b/recipes/dmri-amico/meta.yaml @@ -6,7 +6,6 @@ package: version: {{ version }} source: - fn: {{ name }}-{{ version }}.tar.gz url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz sha256: 08fe9fe14554656fcfe9862dcdbb40f5cf9fc1cb9af5685435190110b83f1902 diff --git a/recipes/dmri-dicelib/meta.yaml b/recipes/dmri-dicelib/meta.yaml index 77e8c97c41458..56c27436f01d9 100644 --- a/recipes/dmri-dicelib/meta.yaml +++ b/recipes/dmri-dicelib/meta.yaml @@ -6,7 +6,6 @@ package: version: {{ version }} source: - fn: {{ name }}-{{ version }}.tar.gz url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz sha256: 5a2e315e2bebed0cbf19e300a2328827903d77086824ae8f04b0410f65585cc2