From 75fa5584a1e6382d51c6cf8f56c476f3c1061818 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 22 Jan 2024 16:40:55 +0000 Subject: [PATCH 1/8] updated v0.15.1 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8c27652..90f2b33 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set tests_to_skip = "_not_a_real_test" %} -{% set version = "0.15.0" %} +{% set version = "0.15.1" %} package: name: tokenizers @@ -7,12 +7,12 @@ package: source: url: https://github.com/huggingface/tokenizers/archive/refs/tags/v{{ version }}.tar.gz - sha256: 7f749421dc97e143cd426816f253923a562b235b187b4bd345765af9f86b11e4 + sha256: 46c3beb449a505a304ba4a5793842bda343d6586622c838ce56568a87584efb6 patches: - patches/0001-don-t-fork-on-windows.patch # [win] build: - number: 1 + number: 0 missing_dso_whitelist: - /usr/lib/libresolv.9.dylib # [osx] - /usr/lib64/libgcc_s.so.1 # [linux] From 40b7986c7f4195044a1ef5e10b088fdcf6708126 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 22 Jan 2024 16:41:11 +0000 Subject: [PATCH 2/8] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.22.14.29.27 --- .gitignore | 25 +++++++++++++++++++++++-- .scripts/build_steps.sh | 6 ------ .scripts/run_docker_build.sh | 6 ++++++ 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c89ecb7..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index eba1dfd..beda247 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -57,12 +57,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b70ef01..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted From d75c69660360d9c8e6c9c2274cc40b243ae3e0fb Mon Sep 17 00:00:00 2001 From: Setu Shah Date: Thu, 25 Jan 2024 19:12:18 -0800 Subject: [PATCH 3/8] fix: Remove PyO3 --- recipe/meta.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 90f2b33..99f7949 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,14 +17,14 @@ build: - /usr/lib/libresolv.9.dylib # [osx] - /usr/lib64/libgcc_s.so.1 # [linux] script: - {% if build_platform != target_platform %} - - export PYO3_CROSS_INCLUDE_DIR=$PREFIX/include - - export PYO3_CROSS_LIB_DIR=$SP_DIR/../ - - export PYO3_CROSS_PYTHON_VERSION=$PY_VER - # see below for what OPENSSL_DIR should be pointing to: - # https://github.com/sfackler/rust-openssl/blob/openssl-sys-v0.9.72/openssl/src/lib.rs#L55-L56 - - export OPENSSL_DIR=$PREFIX - {% endif %} + # {% if build_platform != target_platform %} + # - export PYO3_CROSS_INCLUDE_DIR=$PREFIX/include + # - export PYO3_CROSS_LIB_DIR=$SP_DIR/../ + # - export PYO3_CROSS_PYTHON_VERSION=$PY_VER + # # see below for what OPENSSL_DIR should be pointing to: + # # https://github.com/sfackler/rust-openssl/blob/openssl-sys-v0.9.72/openssl/src/lib.rs#L55-L56 + # - export OPENSSL_DIR=$PREFIX + # {% endif %} - cd bindings/python - {{ PYTHON }} -m pip install . -vv From b910a95bd1b11a70d037b7c4128e124d378f655d Mon Sep 17 00:00:00 2001 From: Setu Shah Date: Thu, 25 Jan 2024 19:33:21 -0800 Subject: [PATCH 4/8] fix: Add clang --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 99f7949..70bc55f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,6 +36,8 @@ requirements: - maturin >=1.0,<2.0 # [build_platform != target_platform] - {{ compiler('cxx') }} - {{ compiler('rust') }} + - libclang # [unix] + - clangdev # [unix] host: - python - pip From 2da6102b3b8929c2d797de1bc163dd949c6e0dbc Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 26 Jan 2024 13:13:55 +0100 Subject: [PATCH 5/8] Revert "fix: Add clang" This reverts commit b910a95bd1b11a70d037b7c4128e124d378f655d. --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 70bc55f..99f7949 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,8 +36,6 @@ requirements: - maturin >=1.0,<2.0 # [build_platform != target_platform] - {{ compiler('cxx') }} - {{ compiler('rust') }} - - libclang # [unix] - - clangdev # [unix] host: - python - pip From b503ddc866bb5c5d08f0ebb90d783f093bc607e4 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 26 Jan 2024 13:14:07 +0100 Subject: [PATCH 6/8] Revert "fix: Remove PyO3" This reverts commit d75c69660360d9c8e6c9c2274cc40b243ae3e0fb. --- recipe/meta.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 99f7949..90f2b33 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,14 +17,14 @@ build: - /usr/lib/libresolv.9.dylib # [osx] - /usr/lib64/libgcc_s.so.1 # [linux] script: - # {% if build_platform != target_platform %} - # - export PYO3_CROSS_INCLUDE_DIR=$PREFIX/include - # - export PYO3_CROSS_LIB_DIR=$SP_DIR/../ - # - export PYO3_CROSS_PYTHON_VERSION=$PY_VER - # # see below for what OPENSSL_DIR should be pointing to: - # # https://github.com/sfackler/rust-openssl/blob/openssl-sys-v0.9.72/openssl/src/lib.rs#L55-L56 - # - export OPENSSL_DIR=$PREFIX - # {% endif %} + {% if build_platform != target_platform %} + - export PYO3_CROSS_INCLUDE_DIR=$PREFIX/include + - export PYO3_CROSS_LIB_DIR=$SP_DIR/../ + - export PYO3_CROSS_PYTHON_VERSION=$PY_VER + # see below for what OPENSSL_DIR should be pointing to: + # https://github.com/sfackler/rust-openssl/blob/openssl-sys-v0.9.72/openssl/src/lib.rs#L55-L56 + - export OPENSSL_DIR=$PREFIX + {% endif %} - cd bindings/python - {{ PYTHON }} -m pip install . -vv From 0c1e9e2b68f4dfe223cc765144b98b2b1cd58aad Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 26 Jan 2024 13:16:31 +0100 Subject: [PATCH 7/8] Increse osx-64 deployment target to 10.12 --- recipe/conda_build_config.yaml | 2 ++ recipe/meta.yaml | 1 + 2 files changed, 3 insertions(+) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..d6308de --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,2 @@ +MACOSX_DEPLOYMENT_TARGET: # [osx and x86] + - '10.12' # [osx and x86] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 90f2b33..919e85e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -44,6 +44,7 @@ requirements: run: - python - huggingface_hub >=0.16.4,<1.0 + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] test: imports: From 74368718774cfd88ccaf9a8d4b2ac91a458aeb50 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 26 Jan 2024 13:21:31 +0100 Subject: [PATCH 8/8] MNT: Re-rendered with conda-build 3.28.3, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.26.06.19.12 --- .ci_support/osx_64_python3.10.____cpython.yaml | 2 +- .ci_support/osx_64_python3.11.____cpython.yaml | 2 +- .ci_support/osx_64_python3.12.____cpython.yaml | 2 +- .ci_support/osx_64_python3.8.____cpython.yaml | 2 +- .ci_support/osx_64_python3.9.____cpython.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index ea6d021..e7ede1f 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.12' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index ac646bd..1b983c0 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.12' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index d7cd670..49917da 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.12' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index 7e462fb..0c37c11 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.12' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index f4232f5..f9487bd 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.12' channel_sources: - conda-forge channel_targets: