From 3ac7bca1a55d3e672cdb9a4b6ea599ba85707e05 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Fri, 18 Oct 2024 08:11:21 +0200 Subject: [PATCH 1/3] Update to 0.6.14 --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2031a01..bde149c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pyiron_atomistics" %} -{% set version = "0.6.13" %} +{% set version = "0.6.14" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 9fc86a5694379a11f2e2e5c3934082d1fb37ce2cb5610a98b0c34c48a4587c09 + sha256: 27dd57b62a3f63db9581a773bd3465eaf9d6e3d059d276943737e87674b24da2 build: noarch: python @@ -45,15 +45,15 @@ requirements: - ase >=3.22.1,<=3.23.0 - atomistics >=0.1.27,<=0.1.32 - defusedxml >=0.7.0,<=0.7.1 - - h5py >=3.9.0,<=3.11.0 + - h5py >=3.9.0,<=3.12.1 - matplotlib-base >=3.5.3,<=3.9.2 - - mendeleev >=0.12.0,<=0.17.0 + - mendeleev >=0.12.0,<=0.18.1 - mp-api >=0.37.0,<=0.42.2 - numpy >=1.26.0,<=1.26.4 - pandas >=2.0.3,<=2.2.3 - phonopy >=2.20.0,<=2.26.6 - pint >=0.18,<=0.24.3 - - pyiron_base >=0.10.0,<=0.10.2 + - pyiron_base >=0.10.0,<=0.10.4 - pyiron_snippets >=0.1.3,<=0.1.4 - pylammpsmpi >=0.2.18,<=0.2.25 - pyscal3 >=3.2.5,<=3.2.7 From 8f6d759aea4b76e45d064c7849bfad42bb0ea998 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 06:14:33 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.42.2, and conda-forge-pinning 2024.10.17.15.21.02 --- .scripts/build_steps.sh | 4 ++-- azure-pipelines.yml | 29 +++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index af0b9ac..9123720 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -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/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 From 8e31fd6eda341ddba28ecc117f0de4a58481a5e1 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Fri, 18 Oct 2024 08:15:09 +0200 Subject: [PATCH 3/3] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bde149c..dd746c4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,6 +17,7 @@ build: requirements: host: - python >=3.9,<3.13 + - setuptools - pip - ase - atomistics