From e17f63ca09251a23536c8e50ce999a8ce2be0b7f Mon Sep 17 00:00:00 2001 From: John Kerl Date: Tue, 5 Dec 2023 19:22:51 +0000 Subject: [PATCH 1/4] somacore 1.0.6 --- recipe/meta.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 44469bb..05826fb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,13 +1,16 @@ {% set name = "somacore" %} -{% set version = "1.0.4" %} +{% set version = "1.0.6" %} package: name: {{ name|lower }} version: {{ version }} +# Cheat sheet: +# wget 'https://pypi.io/packages/source/s/somacore/somacore-i.j.k.tar.gz' +# shasum -a 256 somacore-i.j.k.tar.gz source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/somacore-{{ version }}.tar.gz - sha256: d5a741c9db3ee7dd6408b425d06bea7a77b17c002956bb8426b01e1905b654a3 + sha256: c25fe6a9ce7e7ddb8198c72b6c4beccd4706775ea7a3fc47783adef2fe58d546 build: noarch: python From a53fa2ff4f357b19bd53ad68688786852830b8c1 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Tue, 5 Dec 2023 19:44:46 +0000 Subject: [PATCH 2/4] include pyarrow_hotfix --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 05826fb..d45298e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -32,6 +32,7 @@ requirements: - numpy >=1.21 - pandas - pyarrow + - pyarrow_hotfix - scipy - typing-extensions >=4.1 # For LiteralString # See also https://github.com/single-cell-data/SOMA/blob/VERSION-GOES-HERE/pyproject.toml From f83450c493cd9936b00567584793accea7422bd6 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Tue, 5 Dec 2023 19:45:03 +0000 Subject: [PATCH 3/4] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.30.1, and conda-forge-pinning 2023.12.05.11.44.25 --- .azure-pipelines/azure-pipelines-linux.yml | 8 +++----- .scripts/build_steps.sh | 20 ++++++++++++++------ .scripts/logging_utils.sh | 4 ++-- .scripts/run_docker_build.sh | 3 +++ 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 8f69b57..70b03ca 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -15,11 +15,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | @@ -30,6 +25,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index e21030c..f1d0c08 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,14 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -53,6 +54,12 @@ 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}" @@ -66,7 +73,8 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then else conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Uploading packages" ) 2> /dev/null diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index c4079b7..db9a6e2 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -91,6 +91,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ "${DOCKER_IMAGE}" \ bash \ From bcb36ba8549f19c2add1b78113c4ca521d3f9446 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Tue, 5 Dec 2023 19:52:38 +0000 Subject: [PATCH 4/4] typofix --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d45298e..f8c4214 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -32,7 +32,7 @@ requirements: - numpy >=1.21 - pandas - pyarrow - - pyarrow_hotfix + - pyarrow-hotfix - scipy - typing-extensions >=4.1 # For LiteralString # See also https://github.com/single-cell-data/SOMA/blob/VERSION-GOES-HERE/pyproject.toml