From 427dc88c3103c6db02fe2a2694313704ba8c584d Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 14 Jan 2025 15:02:40 -0600 Subject: [PATCH 1/6] Release 2.237.3, relax cloudpickle pin --- conda-forge.yml | 2 ++ recipe/meta.yaml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 8e52d9e..08853ee 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -6,6 +6,8 @@ conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main +bot: + inspection: update-grayskull conda_build: pkg_format: '2' test: native_and_emulated diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d046357..133b13a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "sagemaker-python-sdk" %} -{% set version = "2.228.0" %} +{% set version = "2.237.3" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/sagemaker/sagemaker-{{ version }}.tar.gz - sha256: 67632d5376abfa0e324bd1c7039b744a93e44af96dbbac507a3a94c734eff671 + sha256: 3193e4fe89087959aca9b037a3659dce437a5f27f3bf750faba20b21f05e6e66 build: entry_points: @@ -26,7 +26,7 @@ requirements: - python >=3.8 - attrs >=23.1.0,<24 - boto3 >=1.26.131,<2.0 - - cloudpickle ==2.2.1 + - cloudpickle >=2.2.1 - google-pasta - numpy >=1.9.0,<2.0 - protobuf >=3.12,<5.0 From f3c82ca1aefc85ff97934689477e93a05d6be103 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2025 21:08:03 +0000 Subject: [PATCH 2/6] MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.2, and conda-forge-pinning 2025.01.11.16.15.44 --- .azure-pipelines/azure-pipelines-linux.yml | 2 +- .ci_support/linux_64_.yaml | 10 ++++++-- .scripts/build_steps.sh | 16 ++++++------ azure-pipelines.yml | 29 ++++++++++++++++++++-- build-locally.py | 12 ++++++++- 5 files changed, 56 insertions(+), 13 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 875d996..1741648 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,7 +11,7 @@ jobs: linux_64_: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 82f2873..4427853 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,8 +1,14 @@ cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251..827a29f 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,18 +31,20 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -74,8 +76,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad85a2c..d309e84 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,5 +2,30 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index d78427b..c4a56c6 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob import os import platform @@ -23,6 +26,13 @@ def setup_environment(ns): os.path.dirname(__file__), "miniforge3" ) + # The default cache location might not be writable using docker on macOS. + if ns.config.startswith("linux") and platform.system() == "Darwin": + os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( + os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") + + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" + ) + def run_docker_build(ns): script = ".scripts/run_docker_build.sh" From 04e062fc9b2708b95f8b16a87e45e1f405d296f7 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 14 Jan 2025 15:08:09 -0600 Subject: [PATCH 3/6] resolve duplicate keys in conda-forge.yml --- conda-forge.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 08853ee..7cc4a83 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,13 +1,12 @@ bot: automerge: true + inspection: update-grayskull build_platform: osx_arm64: osx_64 conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main -bot: - inspection: update-grayskull conda_build: pkg_format: '2' test: native_and_emulated From 8d8c61cd9a0d7f93177547ab3845dae4f614c883 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 14 Jan 2025 15:11:30 -0600 Subject: [PATCH 4/6] follow noarch:python suggestions --- recipe/meta.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 133b13a..02ecf99 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -6,7 +6,7 @@ package: version: {{ version }} source: - url: https://pypi.io/packages/source/{{ name[0] }}/sagemaker/sagemaker-{{ version }}.tar.gz + url: https://pypi.org/packages/source/{{ name[0] }}/sagemaker/sagemaker-{{ version }}.tar.gz sha256: 3193e4fe89087959aca9b037a3659dce437a5f27f3bf750faba20b21f05e6e66 build: @@ -18,12 +18,12 @@ build: requirements: host: - - python >=3.8 + - python {{ python_min }} - pip - setuptools - hatchling run: - - python >=3.8 + - python >={{ python_min }} - attrs >=23.1.0,<24 - boto3 >=1.26.131,<2.0 - cloudpickle >=2.2.1 @@ -76,6 +76,7 @@ test: - sagemaker-upgrade-v2 --help requires: - pip + - python {{ python_min }} about: home: https://github.com/aws/sagemaker-python-sdk/ From 734ec4a080f776ae4d65f09e8840bb5f89fdca4f Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2025 21:13:54 +0000 Subject: [PATCH 5/6] MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.2, and conda-forge-pinning 2025.01.11.16.15.44 --- .ci_support/linux_64_.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 4427853..493b486 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -12,3 +12,5 @@ pin_run_as_build: max_pin: x.x python: - 3.12.* *_cpython +python_min: +- '3.9' From 6c0a446d58cf40391a47746df25fa5a4c4bfd357 Mon Sep 17 00:00:00 2001 From: Clayton Parnell Date: Wed, 15 Jan 2025 20:12:09 +0000 Subject: [PATCH 6/6] Add sagemaker-core dependency, update other dependencies --- recipe/meta.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 02ecf99..22c28d8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,23 +24,28 @@ requirements: - hatchling run: - python >={{ python_min }} + - sagemaker-core >=1.0.17,<2.0.0 - attrs >=23.1.0,<24 - - boto3 >=1.26.131,<2.0 + - boto3 >=1.35.75,<2.0 - cloudpickle >=2.2.1 - google-pasta - numpy >=1.9.0,<2.0 - - protobuf >=3.12,<5.0 + - protobuf >=3.12,<6.0 + - omegaconf >=2.2,<2.3 - smdebug-rulesconfig ==1.0.1 - importlib-metadata >=1.4.0,<7.0 - packaging >=20.0 - pandas + - smdebug-rulesconfig ==1.0.1 + - fastapi - pathos - schema - pyyaml ~=6.0 - jsonschema - platformdirs - - tblib >=1.7.0,<3 - - urllib3 <1.27 + - tblib >=1.7.0,<4 + - urllib3 >=1.26.8,<3.0.0 + - uvicorn - requests - docker-py - tqdm