From 3f87c4cd756eed64da9e0fa7302eb7e8ece89e36 Mon Sep 17 00:00:00 2001 From: Hadrien Mary Date: Sun, 3 Nov 2024 15:58:02 -0500 Subject: [PATCH 01/12] add docling's downstream deps --- recipes/deepsearch-toolkit/recipe.yaml | 59 +++++++++++++++++ recipes/docling-core/recipe.yaml | 55 ++++++++++++++++ recipes/docling-ibm-models/recipe.yaml | 50 +++++++++++++++ recipes/docling-parse/fix-utfcpp.patch | 17 +++++ recipes/docling-parse/recipe.yaml | 74 ++++++++++++++++++++++ recipes/loguru-cpp/recipe.yaml | 63 ++++++++++++++++++ recipes/mean-average-precision/recipe.yaml | 46 ++++++++++++++ 7 files changed, 364 insertions(+) create mode 100644 recipes/deepsearch-toolkit/recipe.yaml create mode 100644 recipes/docling-core/recipe.yaml create mode 100644 recipes/docling-ibm-models/recipe.yaml create mode 100644 recipes/docling-parse/fix-utfcpp.patch create mode 100644 recipes/docling-parse/recipe.yaml create mode 100644 recipes/loguru-cpp/recipe.yaml create mode 100644 recipes/mean-average-precision/recipe.yaml diff --git a/recipes/deepsearch-toolkit/recipe.yaml b/recipes/deepsearch-toolkit/recipe.yaml new file mode 100644 index 0000000000000..bb1f0e03e5e10 --- /dev/null +++ b/recipes/deepsearch-toolkit/recipe.yaml @@ -0,0 +1,59 @@ +context: + name: deepsearch-toolkit + version: 1.1.1 + +package: + name: ${{ name|lower }} + version: ${{ version }} + +source: + url: https://pypi.org/packages/source/${{ name[0] }}/${{ name }}/deepsearch_toolkit-${{ version }}.tar.gz + sha256: 0777d26b80ae97f773d2c832288cadcfcb874ca1cf11b8284f03a25c8dd013e0 + +build: + number: 0 + noarch: python + script: python -m pip install . -vv --no-deps --no-build-isolation + python: + entry_points: + - deepsearch = deepsearch.cli:app + +requirements: + host: + - python >=3.10 + - poetry-core + - pip + run: + - python >=3.10 + - urllib3 >=1.26.8 + - six >=1.16.0 + - certifi >=2024.07.04 + - python-dateutil >=2.8.2 + - pydantic >=2.0.3 + - pydantic-settings >=2.4.0 + - python-dotenv >=1.0.0 + - requests >=2.27.1 + - typer >=0.9.0 + - platformdirs >=3.5.1 + - tabulate >=0.8.9 + - pluggy >=1.0.0 + - tqdm >=4.64.0 + - docling-core >=2.0.0 + +tests: + - python: + imports: + - deepsearch + pip_check: false + - script: + - deepsearch --help + +about: + summary: Interact with the Deep Search platform for new knowledge explorations and discoveries + license: MIT + license_file: LICENSE + homepage: https://ds4sd.github.io/deepsearch-toolkit/ + +extra: + recipe-maintainers: + - hadim diff --git a/recipes/docling-core/recipe.yaml b/recipes/docling-core/recipe.yaml new file mode 100644 index 0000000000000..c29c5724ac45f --- /dev/null +++ b/recipes/docling-core/recipe.yaml @@ -0,0 +1,55 @@ +context: + name: docling-core + version: 2.3.1 + +package: + name: ${{ name|lower }} + version: ${{ version }} + +source: + url: https://pypi.org/packages/source/${{ name[0] }}/${{ name }}/docling_core-${{ version }}.tar.gz + sha256: b32f588fc869b9cc633da7095fa8b8277b8f9f0f3e6c9e000f3e16266dc9599d + +build: + number: 0 + noarch: python + script: python -m pip install . -vv --no-deps --no-build-isolation + python: + entry_points: + - validate = docling_core.utils.validate:main + - generate_jsonschema = docling_core.utils.generate_jsonschema:main + - generate_docs = docling_core.utils.generate_docs:main + +requirements: + host: + - python >=3.10 + - poetry-core >=1.0.0 + - pip + run: + - python >=3.10 + - jsonschema >=4.16 + - pydantic >=2.6 + - jsonref >=1.1 + - tabulate >=0.9 + - pandas >=2.1.4 + - pillow >=10.3 + +tests: + - python: + imports: + - docling_core + pip_check: false + - script: + - validate --help + - generate_jsonschema --help + - generate_docs --help + +about: + summary: A python library to define and validate data types in Docling. + license: MIT + license_file: LICENSE + homepage: https://ds4sd.github.io/ + +extra: + recipe-maintainers: + - hadim diff --git a/recipes/docling-ibm-models/recipe.yaml b/recipes/docling-ibm-models/recipe.yaml new file mode 100644 index 0000000000000..39c3bcf2f3ad7 --- /dev/null +++ b/recipes/docling-ibm-models/recipe.yaml @@ -0,0 +1,50 @@ +context: + name: docling-ibm-models + version: 2.0.3 + +package: + name: ${{ name|lower }} + version: ${{ version }} + +source: + url: https://pypi.org/packages/source/${{ name[0] }}/${{ name }}/docling_ibm_models-${{ version }}.tar.gz + sha256: 4ac155490a8646daca8aa7a45f0ee136ef96c4a0fbc24812694ec8fc45e5cadb + +build: + number: 0 + noarch: python + script: python -m pip install . -vv --no-deps --no-build-isolation + +requirements: + host: + - python >=3.10 + - poetry-core >=1.0.0 + - pip + run: + - python >=3.10 + - pytorch >=2.2.2 + - torchvision + - numpy + - lxml >=4.9.1 + - jsonlines >=3.1.0 + - pillow >=10.0.0 + - tqdm >=4.64.0 + - mean-average-precision >=2021.4.26.0 + - py-opencv >=4.6.0 + - huggingface_hub >=0.23 + +tests: + - python: + imports: + - docling_ibm_models + pip_check: false + +about: + summary: This package contains the AI models used by the Docling PDF conversion package + license: MIT + license_file: LICENSE + homepage: https://github.com/DS4SD/docling-ibm-models + +extra: + recipe-maintainers: + - hadim diff --git a/recipes/docling-parse/fix-utfcpp.patch b/recipes/docling-parse/fix-utfcpp.patch new file mode 100644 index 0000000000000..109fef08ce734 --- /dev/null +++ b/recipes/docling-parse/fix-utfcpp.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/extlib_utf8.git.cmake b/cmake/extlib_utf8.git.cmake +index daf3588..37789e4 100644 +--- a/cmake/extlib_utf8.git.cmake ++++ b/cmake/extlib_utf8.git.cmake +@@ -7,10 +7,10 @@ if(USE_SYSTEM_DEPS) + message(STATUS "using system-deps in extlib_utf8.cmake") + + # this will define the utf8cpp target +- find_package(utf8cpp REQUIRED) ++ #find_package(utfcpp REQUIRED) + + add_library(${ext_name} INTERFACE IMPORTED) +- add_dependencies(${ext_name} utf8cpp) ++ add_dependencies(${ext_name} utfcpp) + + else() + message(STATUS "ignoring system-deps extlib_utf8.cmake") diff --git a/recipes/docling-parse/recipe.yaml b/recipes/docling-parse/recipe.yaml new file mode 100644 index 0000000000000..859d6f05545bc --- /dev/null +++ b/recipes/docling-parse/recipe.yaml @@ -0,0 +1,74 @@ +context: + name: docling-parse + version: 2.0.2 + +package: + name: ${{ name|lower }} + version: ${{ version }} + +source: + url: https://pypi.org/packages/source/${{ name[0] }}/${{ name }}/docling_parse-${{ version }}.tar.gz + sha256: 18823b491b060972df7c2623184896005435b1ec8a9fb5e386427207e2dda0bd + patches: + - fix-utfcpp.patch + +build: + number: 0 + script: + content: python -m pip install . -vv --no-deps --no-build-isolation + env: + USE_SYSTEM_DEPS: "on" + python: + entry_points: + - docling-parse = docling_parse.run:main + +requirements: + build: + - if: build_platform != target_platform + then: + - python + - cross-python_${{ target_platform }} + + - ${{ compiler('cxx') }} + - ${{ compiler('c') }} + - ${{ stdlib("c") }} + - cmake + - ${{ "make" if unix else "ninja" }} + - pkg-config + host: + - python + - poetry-core + - pybind11 >=2.13.1 + - pip + - cxxopts + - loguru-cpp + - nlohmann_json + - utfcpp + - libjpeg-turbo + - qpdf + - zlib + run: + - python + - tabulate >=0.9.0 + - ${{ "pywin32 >=305" if win }} + +tests: + - python: + imports: + - docling_parse + pip_check: true + - script: + - docling-parse --help + +about: + summary: Simple package to extract text with coordinates from programmatic PDFs + license: BSD-3-Clause AND MIT + license_file: + - LICENSE + - docling_parse/pdf_resources_v2/cmap-resources/LICENSE.md + - docling_parse/pdf_resources/cmap-resources/LICENSE.md + homepage: https://github.com/DS4SD/docling-parse + +extra: + recipe-maintainers: + - hadim diff --git a/recipes/loguru-cpp/recipe.yaml b/recipes/loguru-cpp/recipe.yaml new file mode 100644 index 0000000000000..f709bce14b24f --- /dev/null +++ b/recipes/loguru-cpp/recipe.yaml @@ -0,0 +1,63 @@ +context: + name: loguru-cpp + version: 2.1.1 + +package: + name: ${{ name|lower }} + version: ${{ version }} + +source: + # See https://github.com/emilk/loguru/issues/253 + git: https://github.com/emilk/loguru + rev: 4adaa185883e3c04da25913579c451d3c32cfac1 + +build: + number: 0 + script: + - if: win + then: | + cmake -GNinja ^ + -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ + -DBUILD_SHARED_LIBS=ON ^ + -DLOGURU_WITH_STREAMS=ON ^ + %SRC_DIR% + ninja install + else: | + cmake -GNinja \ + -DCMAKE_INSTALL_PREFIX=$PREFIX \ + -DBUILD_SHARED_LIBS=ON \ + -DLOGURU_WITH_STREAMS=ON \ + $SRC_DIR + ninja install + +requirements: + build: + - ${{ compiler('cxx') }} + - ${{ stdlib("c") }} + - cmake + - ninja + run_exports: + - ${{ pin_subpackage(name, upper_bound='x.x.x') }} + +tests: + - package_contents: + include: + - loguru/loguru.hpp + lib: + - loguru + files: + - "*/loguru-config-version.cmake" + - "*/loguru-config.cmake" + - "*/loguru-targets-release.cmake" + - "*/loguru-targets.cmake" + - "*/loguru.pc" + +about: + summary: A lightweight C++ logging library + license: Unlicense + license_file: LICENSE + homepage: https://github.com/emilk/loguru + +extra: + recipe-maintainers: + - hadim diff --git a/recipes/mean-average-precision/recipe.yaml b/recipes/mean-average-precision/recipe.yaml new file mode 100644 index 0000000000000..f9d1cd7882bea --- /dev/null +++ b/recipes/mean-average-precision/recipe.yaml @@ -0,0 +1,46 @@ +context: + name: mean-average-precision + version: 2024.01.05.0 + +package: + name: ${{ name|lower }} + version: ${{ version }} + +source: + url: https://github.com/bes-dev/mean_average_precision/archive/refs/tags/${{ version }}.tar.gz + sha256: b25dda0fdcf1f55d4ae8b9848fb1154369e87323bf472f9cd74da10cbaf992d0 + +build: + number: 0 + noarch: python + script: python -m pip install . -vv --no-deps --no-build-isolation + +requirements: + host: + - python >=3.10 + - setuptools + - pip + run: + - python >=3.10 + - numpy + - pandas + +tests: + - python: + imports: + - mean_average_precision + - requirements: + run: + - pip + script: + - pip check + +about: + summary: Mean Average Precision evaluator for object detection. + license: MIT + license_file: LICENSE + homepage: https://github.com/bes-dev/mean_average_precision/ + +extra: + recipe-maintainers: + - hadim From ae1fb86842c9bc35c92e96e9af5f6eb45d694bcf Mon Sep 17 00:00:00 2001 From: Hadrien Mary Date: Sun, 3 Nov 2024 16:12:15 -0500 Subject: [PATCH 02/12] fix graph dep --- recipes/docling-parse/recipe.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/docling-parse/recipe.yaml b/recipes/docling-parse/recipe.yaml index 859d6f05545bc..e55249dcdeb9e 100644 --- a/recipes/docling-parse/recipe.yaml +++ b/recipes/docling-parse/recipe.yaml @@ -51,6 +51,7 @@ requirements: - python - tabulate >=0.9.0 - ${{ "pywin32 >=305" if win }} + - loguru-cpp # only for staged-recipes so the graph deps is correct tests: - python: From 0ae9cef872054af50fbdd5fa1e101be3b4ebbe7f Mon Sep 17 00:00:00 2001 From: Hadrien Mary Date: Sun, 3 Nov 2024 16:22:55 -0500 Subject: [PATCH 03/12] remove loguru-cpp --- recipes/loguru-cpp/recipe.yaml | 63 ---------------------------------- 1 file changed, 63 deletions(-) delete mode 100644 recipes/loguru-cpp/recipe.yaml diff --git a/recipes/loguru-cpp/recipe.yaml b/recipes/loguru-cpp/recipe.yaml deleted file mode 100644 index f709bce14b24f..0000000000000 --- a/recipes/loguru-cpp/recipe.yaml +++ /dev/null @@ -1,63 +0,0 @@ -context: - name: loguru-cpp - version: 2.1.1 - -package: - name: ${{ name|lower }} - version: ${{ version }} - -source: - # See https://github.com/emilk/loguru/issues/253 - git: https://github.com/emilk/loguru - rev: 4adaa185883e3c04da25913579c451d3c32cfac1 - -build: - number: 0 - script: - - if: win - then: | - cmake -GNinja ^ - -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ - -DBUILD_SHARED_LIBS=ON ^ - -DLOGURU_WITH_STREAMS=ON ^ - %SRC_DIR% - ninja install - else: | - cmake -GNinja \ - -DCMAKE_INSTALL_PREFIX=$PREFIX \ - -DBUILD_SHARED_LIBS=ON \ - -DLOGURU_WITH_STREAMS=ON \ - $SRC_DIR - ninja install - -requirements: - build: - - ${{ compiler('cxx') }} - - ${{ stdlib("c") }} - - cmake - - ninja - run_exports: - - ${{ pin_subpackage(name, upper_bound='x.x.x') }} - -tests: - - package_contents: - include: - - loguru/loguru.hpp - lib: - - loguru - files: - - "*/loguru-config-version.cmake" - - "*/loguru-config.cmake" - - "*/loguru-targets-release.cmake" - - "*/loguru-targets.cmake" - - "*/loguru.pc" - -about: - summary: A lightweight C++ logging library - license: Unlicense - license_file: LICENSE - homepage: https://github.com/emilk/loguru - -extra: - recipe-maintainers: - - hadim From 6ea9002a0b85bfeee24c7bc76a084e22aa75daaf Mon Sep 17 00:00:00 2001 From: Hadrien Mary Date: Sun, 3 Nov 2024 16:23:45 -0500 Subject: [PATCH 04/12] cleanup --- recipes/docling-parse/recipe.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/docling-parse/recipe.yaml b/recipes/docling-parse/recipe.yaml index e55249dcdeb9e..859d6f05545bc 100644 --- a/recipes/docling-parse/recipe.yaml +++ b/recipes/docling-parse/recipe.yaml @@ -51,7 +51,6 @@ requirements: - python - tabulate >=0.9.0 - ${{ "pywin32 >=305" if win }} - - loguru-cpp # only for staged-recipes so the graph deps is correct tests: - python: From eb465f74725296820086962bce1431b270cec2f7 Mon Sep 17 00:00:00 2001 From: Hadrien Mary Date: Mon, 4 Nov 2024 19:05:31 -0500 Subject: [PATCH 05/12] new noarch syntax --- recipes/deepsearch-toolkit/recipe.yaml | 4 ++-- recipes/docling-core/recipe.yaml | 4 ++-- recipes/docling-ibm-models/recipe.yaml | 4 ++-- recipes/mean-average-precision/recipe.yaml | 10 +++------- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/recipes/deepsearch-toolkit/recipe.yaml b/recipes/deepsearch-toolkit/recipe.yaml index bb1f0e03e5e10..f18f759f1e452 100644 --- a/recipes/deepsearch-toolkit/recipe.yaml +++ b/recipes/deepsearch-toolkit/recipe.yaml @@ -20,11 +20,11 @@ build: requirements: host: - - python >=3.10 + - python {{ python_min }}.* - poetry-core - pip run: - - python >=3.10 + - python >={{ python_min }} - urllib3 >=1.26.8 - six >=1.16.0 - certifi >=2024.07.04 diff --git a/recipes/docling-core/recipe.yaml b/recipes/docling-core/recipe.yaml index c29c5724ac45f..3cd1f8f466fe5 100644 --- a/recipes/docling-core/recipe.yaml +++ b/recipes/docling-core/recipe.yaml @@ -22,11 +22,11 @@ build: requirements: host: - - python >=3.10 + - python {{ python_min }}.* - poetry-core >=1.0.0 - pip run: - - python >=3.10 + - python >={{ python_min }} - jsonschema >=4.16 - pydantic >=2.6 - jsonref >=1.1 diff --git a/recipes/docling-ibm-models/recipe.yaml b/recipes/docling-ibm-models/recipe.yaml index 39c3bcf2f3ad7..b7ce3c1ce9b1b 100644 --- a/recipes/docling-ibm-models/recipe.yaml +++ b/recipes/docling-ibm-models/recipe.yaml @@ -17,11 +17,11 @@ build: requirements: host: - - python >=3.10 + - python {{ python_min }}.* - poetry-core >=1.0.0 - pip run: - - python >=3.10 + - python >={{ python_min }} - pytorch >=2.2.2 - torchvision - numpy diff --git a/recipes/mean-average-precision/recipe.yaml b/recipes/mean-average-precision/recipe.yaml index f9d1cd7882bea..dab8aef669b5a 100644 --- a/recipes/mean-average-precision/recipe.yaml +++ b/recipes/mean-average-precision/recipe.yaml @@ -17,11 +17,11 @@ build: requirements: host: - - python >=3.10 + - python {{ python_min }}.* - setuptools - pip run: - - python >=3.10 + - python >={{ python_min }} - numpy - pandas @@ -29,11 +29,7 @@ tests: - python: imports: - mean_average_precision - - requirements: - run: - - pip - script: - - pip check + pip_check: true about: summary: Mean Average Precision evaluator for object detection. From d8c4b316ad09f4765c5160df61d1736b86fb48d4 Mon Sep 17 00:00:00 2001 From: Hadrien Mary Date: Tue, 5 Nov 2024 07:37:03 -0500 Subject: [PATCH 06/12] fix syntax --- recipes/deepsearch-toolkit/recipe.yaml | 4 ++-- recipes/docling-core/recipe.yaml | 4 ++-- recipes/docling-ibm-models/recipe.yaml | 4 ++-- recipes/mean-average-precision/recipe.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes/deepsearch-toolkit/recipe.yaml b/recipes/deepsearch-toolkit/recipe.yaml index f18f759f1e452..4bb98c80c49e3 100644 --- a/recipes/deepsearch-toolkit/recipe.yaml +++ b/recipes/deepsearch-toolkit/recipe.yaml @@ -20,11 +20,11 @@ build: requirements: host: - - python {{ python_min }}.* + - python ${{ python_min }}.* - poetry-core - pip run: - - python >={{ python_min }} + - python >=${{ python_min }} - urllib3 >=1.26.8 - six >=1.16.0 - certifi >=2024.07.04 diff --git a/recipes/docling-core/recipe.yaml b/recipes/docling-core/recipe.yaml index 3cd1f8f466fe5..ae1e4e0918ba3 100644 --- a/recipes/docling-core/recipe.yaml +++ b/recipes/docling-core/recipe.yaml @@ -22,11 +22,11 @@ build: requirements: host: - - python {{ python_min }}.* + - python ${{ python_min }}.* - poetry-core >=1.0.0 - pip run: - - python >={{ python_min }} + - python >=${{ python_min }} - jsonschema >=4.16 - pydantic >=2.6 - jsonref >=1.1 diff --git a/recipes/docling-ibm-models/recipe.yaml b/recipes/docling-ibm-models/recipe.yaml index b7ce3c1ce9b1b..f1a265ddd8d0b 100644 --- a/recipes/docling-ibm-models/recipe.yaml +++ b/recipes/docling-ibm-models/recipe.yaml @@ -17,11 +17,11 @@ build: requirements: host: - - python {{ python_min }}.* + - python ${{ python_min }}.* - poetry-core >=1.0.0 - pip run: - - python >={{ python_min }} + - python >=${{ python_min }} - pytorch >=2.2.2 - torchvision - numpy diff --git a/recipes/mean-average-precision/recipe.yaml b/recipes/mean-average-precision/recipe.yaml index dab8aef669b5a..0462cf02f0f4b 100644 --- a/recipes/mean-average-precision/recipe.yaml +++ b/recipes/mean-average-precision/recipe.yaml @@ -17,11 +17,11 @@ build: requirements: host: - - python {{ python_min }}.* + - python ${{ python_min }}.* - setuptools - pip run: - - python >={{ python_min }} + - python >=${{ python_min }} - numpy - pandas From 41f4b9dbd2870b4b517a54a68c6ebf6ee63f45a8 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 5 Nov 2024 08:36:14 -0600 Subject: [PATCH 07/12] test: see what is in the cbc --- .scripts/run_osx_build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 16e24f95e3709..6f62472afd6d6 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -73,6 +73,9 @@ git ls-tree --name-only main -- . | xargs -I {} sh -c "rm -rf {} && echo Removin popd > /dev/null echo "" +echo "conda-build-config.yaml from pinnings:" +cat ${MINIFORGE_HOME}/conda_build_config.yaml + ( endgroup "Configuring conda" ) 2> /dev/null # We just want to build all of the recipes. From ce502d07716574297da2546d15b8a2b94fef2225 Mon Sep 17 00:00:00 2001 From: Hadrien Mary Date: Tue, 5 Nov 2024 10:51:48 -0500 Subject: [PATCH 08/12] hard code python_min --- recipes/deepsearch-toolkit/recipe.yaml | 1 + recipes/docling-core/recipe.yaml | 1 + recipes/docling-ibm-models/recipe.yaml | 1 + recipes/mean-average-precision/recipe.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/recipes/deepsearch-toolkit/recipe.yaml b/recipes/deepsearch-toolkit/recipe.yaml index 4bb98c80c49e3..bc98690bcd2f1 100644 --- a/recipes/deepsearch-toolkit/recipe.yaml +++ b/recipes/deepsearch-toolkit/recipe.yaml @@ -1,6 +1,7 @@ context: name: deepsearch-toolkit version: 1.1.1 + python_min: "3.9" # remove this line once https://github.com/prefix-dev/rattler-build/pull/1122 is available package: name: ${{ name|lower }} diff --git a/recipes/docling-core/recipe.yaml b/recipes/docling-core/recipe.yaml index ae1e4e0918ba3..d3e98feb8cb63 100644 --- a/recipes/docling-core/recipe.yaml +++ b/recipes/docling-core/recipe.yaml @@ -1,6 +1,7 @@ context: name: docling-core version: 2.3.1 + python_min: "3.9" # remove this line once https://github.com/prefix-dev/rattler-build/pull/1122 is available package: name: ${{ name|lower }} diff --git a/recipes/docling-ibm-models/recipe.yaml b/recipes/docling-ibm-models/recipe.yaml index f1a265ddd8d0b..13cc5105adaba 100644 --- a/recipes/docling-ibm-models/recipe.yaml +++ b/recipes/docling-ibm-models/recipe.yaml @@ -1,6 +1,7 @@ context: name: docling-ibm-models version: 2.0.3 + python_min: "3.9" # remove this line once https://github.com/prefix-dev/rattler-build/pull/1122 is available package: name: ${{ name|lower }} diff --git a/recipes/mean-average-precision/recipe.yaml b/recipes/mean-average-precision/recipe.yaml index 0462cf02f0f4b..e217bb474c10b 100644 --- a/recipes/mean-average-precision/recipe.yaml +++ b/recipes/mean-average-precision/recipe.yaml @@ -1,6 +1,7 @@ context: name: mean-average-precision version: 2024.01.05.0 + python_min: "3.9" # remove this line once https://github.com/prefix-dev/rattler-build/pull/1122 is available package: name: ${{ name|lower }} From 33b0ae2c39b23e066a920f6f44a4fe65dc60d229 Mon Sep 17 00:00:00 2001 From: Hadrien Mary Date: Tue, 5 Nov 2024 10:55:31 -0500 Subject: [PATCH 09/12] Update run_osx_build.sh --- .scripts/run_osx_build.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 6f62472afd6d6..16e24f95e3709 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -73,9 +73,6 @@ git ls-tree --name-only main -- . | xargs -I {} sh -c "rm -rf {} && echo Removin popd > /dev/null echo "" -echo "conda-build-config.yaml from pinnings:" -cat ${MINIFORGE_HOME}/conda_build_config.yaml - ( endgroup "Configuring conda" ) 2> /dev/null # We just want to build all of the recipes. From 66f8a52d9a025752e1ecd9813a68dcd4593a8e38 Mon Sep 17 00:00:00 2001 From: Hadrien Mary Date: Tue, 5 Nov 2024 10:56:45 -0500 Subject: [PATCH 10/12] 3.10 for ibm-models --- recipes/docling-ibm-models/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/docling-ibm-models/recipe.yaml b/recipes/docling-ibm-models/recipe.yaml index 13cc5105adaba..1fb71af22d124 100644 --- a/recipes/docling-ibm-models/recipe.yaml +++ b/recipes/docling-ibm-models/recipe.yaml @@ -1,7 +1,7 @@ context: name: docling-ibm-models version: 2.0.3 - python_min: "3.9" # remove this line once https://github.com/prefix-dev/rattler-build/pull/1122 is available + python_min: "3.10" # remove this line once https://github.com/prefix-dev/rattler-build/pull/1122 is available package: name: ${{ name|lower }} From dd46ca47f4ff16eb3cc2aab71203c0f88dcc385b Mon Sep 17 00:00:00 2001 From: Hadrien Mary Date: Thu, 7 Nov 2024 11:04:45 -0500 Subject: [PATCH 11/12] dummy commit --- recipes/deepsearch-toolkit/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/deepsearch-toolkit/recipe.yaml b/recipes/deepsearch-toolkit/recipe.yaml index bc98690bcd2f1..8542c56833957 100644 --- a/recipes/deepsearch-toolkit/recipe.yaml +++ b/recipes/deepsearch-toolkit/recipe.yaml @@ -51,8 +51,8 @@ tests: about: summary: Interact with the Deep Search platform for new knowledge explorations and discoveries - license: MIT license_file: LICENSE + license: MIT homepage: https://ds4sd.github.io/deepsearch-toolkit/ extra: From a5dfabcd9061c2a22073877e45a863d59793fefb Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Mon, 11 Nov 2024 08:36:00 -0600 Subject: [PATCH 12/12] fix: remove .* for python min --- recipes/deepsearch-toolkit/recipe.yaml | 2 +- recipes/docling-core/recipe.yaml | 2 +- recipes/docling-ibm-models/recipe.yaml | 2 +- recipes/mean-average-precision/recipe.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/deepsearch-toolkit/recipe.yaml b/recipes/deepsearch-toolkit/recipe.yaml index 8542c56833957..4a02f3b499e4e 100644 --- a/recipes/deepsearch-toolkit/recipe.yaml +++ b/recipes/deepsearch-toolkit/recipe.yaml @@ -21,7 +21,7 @@ build: requirements: host: - - python ${{ python_min }}.* + - python ${{ python_min }} - poetry-core - pip run: diff --git a/recipes/docling-core/recipe.yaml b/recipes/docling-core/recipe.yaml index d3e98feb8cb63..0f646490b70ff 100644 --- a/recipes/docling-core/recipe.yaml +++ b/recipes/docling-core/recipe.yaml @@ -23,7 +23,7 @@ build: requirements: host: - - python ${{ python_min }}.* + - python ${{ python_min }} - poetry-core >=1.0.0 - pip run: diff --git a/recipes/docling-ibm-models/recipe.yaml b/recipes/docling-ibm-models/recipe.yaml index 1fb71af22d124..98ee31dc26737 100644 --- a/recipes/docling-ibm-models/recipe.yaml +++ b/recipes/docling-ibm-models/recipe.yaml @@ -18,7 +18,7 @@ build: requirements: host: - - python ${{ python_min }}.* + - python ${{ python_min }} - poetry-core >=1.0.0 - pip run: diff --git a/recipes/mean-average-precision/recipe.yaml b/recipes/mean-average-precision/recipe.yaml index e217bb474c10b..8526a31624cf3 100644 --- a/recipes/mean-average-precision/recipe.yaml +++ b/recipes/mean-average-precision/recipe.yaml @@ -18,7 +18,7 @@ build: requirements: host: - - python ${{ python_min }}.* + - python ${{ python_min }} - setuptools - pip run: