From 7f295b5697d85134bf9580e2ae9e7b0260fca0da Mon Sep 17 00:00:00 2001 From: ngam <67342040+ngam@users.noreply.github.com> Date: Sun, 6 Feb 2022 14:11:30 -0500 Subject: [PATCH] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.16.2, and conda-forge-pinning 2022.02.06.08.21.47 --- ...ersion7numpy1.18python3.7.____cpython.yaml | 2 +- ...ersion7numpy1.18python3.8.____cpython.yaml | 2 +- ...ersion7numpy1.19python3.9.____cpython.yaml | 2 +- ...rsion7numpy1.21python3.10.____cpython.yaml | 2 +- ...ersion9numpy1.18python3.7.____cpython.yaml | 2 +- ...ersion9numpy1.18python3.8.____cpython.yaml | 2 +- ...ersion9numpy1.19python3.9.____cpython.yaml | 2 +- ...rsion9numpy1.21python3.10.____cpython.yaml | 2 +- ...ersion9numpy1.18python3.7.____cpython.yaml | 2 +- ...ersion9numpy1.18python3.8.____cpython.yaml | 2 +- ...ersion9numpy1.19python3.9.____cpython.yaml | 2 +- ...rsion9numpy1.21python3.10.____cpython.yaml | 2 +- ...ersion9numpy1.18python3.7.____cpython.yaml | 2 +- ...ersion9numpy1.18python3.8.____cpython.yaml | 2 +- ...ersion9numpy1.19python3.9.____cpython.yaml | 2 +- ...rsion9numpy1.21python3.10.____cpython.yaml | 2 +- ...ersion9numpy1.18python3.7.____cpython.yaml | 2 +- ...ersion9numpy1.18python3.8.____cpython.yaml | 2 +- ...ersion9numpy1.19python3.9.____cpython.yaml | 2 +- ...rsion9numpy1.21python3.10.____cpython.yaml | 2 +- .ci_support/migrations/icu69.yaml | 7 --- ...osx_64_numpy1.18python3.7.____cpython.yaml | 2 +- ...osx_64_numpy1.18python3.8.____cpython.yaml | 2 +- ...osx_64_numpy1.19python3.9.____cpython.yaml | 2 +- ...sx_64_numpy1.21python3.10.____cpython.yaml | 2 +- ..._arm64_numpy1.19python3.8.____cpython.yaml | 2 +- ..._arm64_numpy1.19python3.9.____cpython.yaml | 2 +- ...arm64_numpy1.21python3.10.____cpython.yaml | 2 +- .scripts/build_steps.sh | 1 - .scripts/run_osx_build.sh | 1 - README.md | 5 +- recipe/patches/customize-setup.patch | 46 +++++++++++++++++++ 32 files changed, 75 insertions(+), 39 deletions(-) delete mode 100644 .ci_support/migrations/icu69.yaml create mode 100644 recipe/patches/customize-setup.patch diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.7.____cpython.yaml index 7b2a898e..6d065610 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.7.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.8.____cpython.yaml index 318dbb84..c4137ab8 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.18python3.8.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython.yaml index ec6e6fc6..6c50101c 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython.yaml index 34bc60f8..a4e11d0f 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml index c4f2845b..8839419f 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml index 1e9307be..a38ea09e 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml index 69697a24..f4a7d5d6 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml index dfd9f2b0..b175352d 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml index b02f6327..78dd1354 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml index 1dffbd96..44355f55 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml index 104d6ee6..7e138bec 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml index 55cdc0d9..22a9a793 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.1cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml index 8cc80844..8d70f510 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.7.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml index 863f4f6a..f8e974d4 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.18python3.8.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml index 8ad22a2a..d6323380 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml index 213f9237..5be1b486 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.2cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.7.____cpython.yaml index 065dbb6d..9476f7dc 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.7.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.8.____cpython.yaml index 62fe4c08..6f3c9ea3 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.18python3.8.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.19python3.9.____cpython.yaml index a7eb1546..b9de087b 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.19python3.9.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.21python3.10.____cpython.yaml index a5f67332..a3e019f9 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_versionNonecudnnundefinedcxx_compiler_version9numpy1.21python3.10.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/migrations/icu69.yaml b/.ci_support/migrations/icu69.yaml deleted file mode 100644 index 0cfadd8c..00000000 --- a/.ci_support/migrations/icu69.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -icu: -- '69' -migrator_ts: 1635419000.7351162 diff --git a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml index c3e9b0e3..7769347b 100644 --- a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml index 9a90e52a..0b972b8b 100644 --- a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml index 7110d423..8dee2e39 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml index 29c424e0..be2b9565 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml index e55f7d76..1dbe017e 100644 --- a/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler_version: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml index 077ad2e2..d505c9b8 100644 --- a/.ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler_version: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml index ddfde84e..f8fcea4a 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler_version: giflib: - '5.2' grpc_cpp: -- '1.42' +- '1.43' icu: - '69' jpeg: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index d56dd183..ff01283b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,7 +31,6 @@ CONDARC mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge -mamba update --update-specs --yes --quiet -c conda-forge/label/lief_dev -c conda-forge py-lief # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index d4176f78..d10e0c2c 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,7 +26,6 @@ conda activate base echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." mamba install -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa mamba update -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa -mamba update -n base --update-specs --quiet --yes -c conda-forge/label/lief_dev -c conda-forge py-lief diff --git a/README.md b/README.md index 8c16fd78..a291176c 100644 --- a/README.md +++ b/README.md @@ -244,7 +244,6 @@ Current release info | [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--base-green.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | | [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--cpu-green.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | | [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--estimator-green.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--gpu-green.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | Installing tensorflow ===================== @@ -256,10 +255,10 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `libtensorflow, libtensorflow_cc, tensorflow, tensorflow-base, tensorflow-cpu, tensorflow-estimator, tensorflow-gpu` can be installed with: +Once the `conda-forge` channel has been enabled, `libtensorflow, libtensorflow_cc, tensorflow, tensorflow-base, tensorflow-cpu, tensorflow-estimator` can be installed with: ``` -conda install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator tensorflow-gpu +conda install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator ``` It is possible to list all of the versions of `libtensorflow` available on your platform with: diff --git a/recipe/patches/customize-setup.patch b/recipe/patches/customize-setup.patch new file mode 100644 index 00000000..4905ea98 --- /dev/null +++ b/recipe/patches/customize-setup.patch @@ -0,0 +1,46 @@ +From 3be2fa4f6b4b85fcd94ba01dd6ac0b5b29f432b8 Mon Sep 17 00:00:00 2001 +From: ngam <67342040+ngam@users.noreply.github.com> +Date: Fri, 4 Feb 2022 16:16:54 -0500 +Subject: [PATCH] customize setpy + +--- + tensorflow/tools/pip_package/setup.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py +index 58de3ad9c40..96043f9719c 100644 +--- a/tensorflow/tools/pip_package/setup.py ++++ b/tensorflow/tools/pip_package/setup.py +@@ -78,11 +78,11 @@ REQUIRED_PACKAGES = [ + 'google_pasta >= 0.1.1', + 'h5py >= 2.9.0', + 'keras_preprocessing >= 1.1.1', # 1.1.0 needs tensorflow==1.7 +- 'libclang >= 9.0.1', +- 'numpy >= 1.20', ++ # 'libclang >= 9.0.1', # edit ... ++ # 'numpy >= 1.20', # edit ... + 'opt_einsum >= 2.3.2', + 'protobuf >= 3.9.2', +- 'setuptools', ++ # 'setuptools', # ??? edit ... ??? + 'six >= 1.12.0', + 'termcolor >= 1.1.0', + 'typing_extensions >= 3.6.6', +@@ -91,10 +91,10 @@ REQUIRED_PACKAGES = [ + # These need to be in sync with the existing TF version + # They are updated during the release process + # When updating these, please also update the nightly versions below +- 'tensorboard >= 2.8, < 2.9', +- 'tf-estimator-nightly == 2.8.0.dev2021122109', +- 'keras >= 2.8.0rc0, < 2.9', +- 'tensorflow-io-gcs-filesystem >= 0.23.1', ++ 'tensorboard >= 2.8.0, < 2.9.0', # edit ... ++ 'tensorflow_estimator == 2.8.0', # edit ... ++ 'keras >= 2.8.0rc0, < 2.9', # edit ... ++ # 'tensorflow-io-gcs-filesystem >= 0.23.1', # edit ... + ] + + +-- +2.35.0 +