diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 8b718cb..e5ee260 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -1,5 +1,5 @@ aws_sdk_cpp: -- 1.11.210 +- 1.11.242 cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 7133f7f..89feba5 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -1,5 +1,5 @@ aws_sdk_cpp: -- 1.11.210 +- 1.11.242 cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index 762d6f4..2de374a 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -1,5 +1,5 @@ aws_sdk_cpp: -- 1.11.210 +- 1.11.242 cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index dfc7f65..d77c797 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -1,5 +1,5 @@ aws_sdk_cpp: -- 1.11.210 +- 1.11.242 cdt_name: - cos6 channel_sources: diff --git a/.ci_support/migrations/aws_sdk_cpp111210.yaml b/.ci_support/migrations/aws_sdk_cpp111210.yaml deleted file mode 100644 index e15bef4..0000000 --- a/.ci_support/migrations/aws_sdk_cpp111210.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -aws_sdk_cpp: -- 1.11.210 -migrator_ts: 1701152060.9359148 diff --git a/.ci_support/migrations/aws_sdk_cpp111242.yaml b/.ci_support/migrations/aws_sdk_cpp111242.yaml new file mode 100644 index 0000000..de2cbc0 --- /dev/null +++ b/.ci_support/migrations/aws_sdk_cpp111242.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for aws_sdk_cpp 1.11.242 + kind: version + migration_number: 1 +aws_sdk_cpp: +- 1.11.242 +migrator_ts: 1705191753.9145608 diff --git a/.ci_support/migrations/pytorch21.yaml b/.ci_support/migrations/pytorch21.yaml deleted file mode 100644 index bb91f52..0000000 --- a/.ci_support/migrations/pytorch21.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1699325293.519726 -pytorch: -- '2.1' diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 67761a7..35cf02e 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' aws_sdk_cpp: -- 1.11.210 +- 1.11.242 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 3901be8..b0f948b 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' aws_sdk_cpp: -- 1.11.210 +- 1.11.242 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 1fdaea6..bc759ed 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' aws_sdk_cpp: -- 1.11.210 +- 1.11.242 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 453c4d3..cde82dd 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' aws_sdk_cpp: -- 1.11.210 +- 1.11.242 channel_sources: - conda-forge channel_targets: 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 5382195..f017291 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -54,12 +54,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 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c7728ac..5086165 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -6,10 +6,10 @@ package: source: url: https://github.com/pytorch/data/archive/refs/tags/v{{ version }}.tar.gz - sha256: 1b6589336776ccba19fd3bf435588416105d372f6b85d58a9f2b008286f483bf + sha256: ef9bbdcee759b53c3c9d99e76eb0a66da33d36bfb7f859a25a9b5e737a51fa23 build: - number: 1 + number: 2 # no pytorch on windows in conda-forge, see # https://github.com/conda-forge/pytorch-cpu-feedstock/issues/32 skip: true # [win] @@ -54,7 +54,7 @@ test: - fsspec - numpy * - portalocker >=2.0.0 - - s3fs + - s3fs >=2023.12.2 source_files: - test/ commands: