From 0a2cfcc76391f281afc92adb834bceda472aa5f9 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Sat, 26 Oct 2024 21:24:28 -0400 Subject: [PATCH 1/3] Release 3.5.0, support py313 --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d51c617..78fdc3b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {%- set name = "diffpy.utils" -%} -{%- set version = "3.4.2" -%} +{%- set version = "3.5.0" -%} package: name: {{ name|lower }} @@ -7,22 +7,22 @@ package: source: url: https://pypi.io/packages/source/d/diffpy_utils/diffpy_utils-{{ version }}.tar.gz - sha256: 348b8cdd7c2bf0b90386828ff99e3306f7f5b441d8e926407da95ab6c174d299 + sha256: 16d4433a8dc6c7b95557895a0a95279ced27d118d8d02d572c187d96d5b1fdce build: noarch: python - number: 1 + number: 0 script: python -m pip install --no-deps --ignore-installed . requirements: host: - - python >=3.10 + - python >=3.11 - setuptools - setuptools-git-versioning >=2.0 - pip run: - - python >=3.10 + - python >=3.11 - numpy test: From 9d47694396a6034229f4bb8ef54cc7283383ffda Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Tue, 29 Oct 2024 08:33:49 -0400 Subject: [PATCH 2/3] Add rc version --- recipe/conda_build_config.yaml | 2 ++ 1 file changed, 2 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..d9a1b0a --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,2 @@ +channel_targets: + - conda-forge diffpy.utils_rc From 7a8f7dfe892804743f2f815612e9f7687fc3b885 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 12:37:59 +0000 Subject: [PATCH 3/3] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.0, and conda-forge-pinning 2024.10.29.03.54.34 --- .ci_support/linux_64_.yaml | 2 +- .scripts/build_steps.sh | 14 +++++++------- README.md | 16 ++++++++-------- azure-pipelines.yml | 29 +++++++++++++++++++++++++++-- 4 files changed, 43 insertions(+), 18 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 82f2873..ee35d4f 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -3,6 +3,6 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge diffpy.utils_rc docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index af0b9ac..f8051ab 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,13 +31,13 @@ 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}" @@ -73,8 +73,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/README.md b/README.md index fe8b4db..9cf09f9 100644 --- a/README.md +++ b/README.md @@ -39,14 +39,14 @@ Current release info Installing diffpy.utils ======================= -Installing `diffpy.utils` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `diffpy.utils` from the `conda-forge/label/diffpy.utils_rc` channel can be achieved by adding `conda-forge/label/diffpy.utils_rc` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels conda-forge/label/diffpy.utils_rc conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `diffpy.utils` can be installed with `conda`: +Once the `conda-forge/label/diffpy.utils_rc` channel has been enabled, `diffpy.utils` can be installed with `conda`: ``` conda install diffpy.utils @@ -61,26 +61,26 @@ mamba install diffpy.utils It is possible to list all of the versions of `diffpy.utils` available on your platform with `conda`: ``` -conda search diffpy.utils --channel conda-forge +conda search diffpy.utils --channel conda-forge/label/diffpy.utils_rc ``` or with `mamba`: ``` -mamba search diffpy.utils --channel conda-forge +mamba search diffpy.utils --channel conda-forge/label/diffpy.utils_rc ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search diffpy.utils --channel conda-forge +mamba repoquery search diffpy.utils --channel conda-forge/label/diffpy.utils_rc # List packages depending on `diffpy.utils`: -mamba repoquery whoneeds diffpy.utils --channel conda-forge +mamba repoquery whoneeds diffpy.utils --channel conda-forge/label/diffpy.utils_rc # List dependencies of `diffpy.utils`: -mamba repoquery depends diffpy.utils --channel conda-forge +mamba repoquery depends diffpy.utils --channel conda-forge/label/diffpy.utils_rc ``` diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad85a2c..95d88f6 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: 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