From 2edfbcc2d327a7344bc41a3e29f9c0ee745373c4 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 22 Mar 2024 11:55:13 +0000 Subject: [PATCH 1/6] updated v0.0.12 --- recipe/meta.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e06ddd4..adcfa9f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pyiron_gui" %} -{% set version = "0.0.11" %} +{% set version = "0.0.12" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/pyiron_gui-{{ version }}.tar.gz - sha256: d90c5d086eb8bb9d835bbc2be0d826db43d69898821718e619a10f587e108183 + sha256: 5752f40ef288d442cd7a001e2418e34562d8f380e50a5b4a7a704bb4f20e98c7 build: noarch: python @@ -20,14 +20,14 @@ requirements: - pip run: - python >=3.5 - - pyiron_base >=0.6.9 - - pyiron_atomistics >=0.3.6 - - ipywidgets >=8.1.1 - - matplotlib-base >=3.8.1 - - nbconvert >=7.11.0 - - nbformat >=5.9.2 - - numpy >=1.26.0 - - pandas >=2.1.3 + - pyiron_base >=0.7.7 + - pyiron_atomistics >=0.4.17 + - ipywidgets >=8.1.2 + - matplotlib-base >=3.8.3 + - nbconvert >=7.16.2 + - nbformat >=5.10.3 + - numpy >=1.26.4 + - pandas >=2.2.0 test: imports: From aa10a7d64db7a4731b9439be82748e0f5cacb10d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 22 Mar 2024 11:55:15 +0000 Subject: [PATCH 2/6] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.33.0, and conda-forge-pinning 2024.03.22.10.02.49 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + .gitignore | 25 ++++++++++++++++++++-- .scripts/build_steps.sh | 12 +++-------- .scripts/run_docker_build.sh | 6 ++++++ build-locally.py | 5 +++-- 5 files changed, 36 insertions(+), 13 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index abcbeb9..875d996 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -13,6 +13,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers 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 ab7bc8f..2f3df6c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC 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 + 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 + 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}" @@ -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}" @@ -71,7 +65,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" 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/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From d7fce71ed3ec1f43a5ed307a65d9f50e4a5f82ad Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Fri, 22 Mar 2024 07:08:30 -0500 Subject: [PATCH 3/6] Update meta.yaml --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index adcfa9f..576eb99 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -49,4 +49,3 @@ extra: - pyiron-runner - jan-janssen - pmrv - - niklassiemer From 47d7e1b80ffad377bb71f9a6cc7f5d1ded5c1cbb Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 12:10:33 +0000 Subject: [PATCH 4/6] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.33.0, and conda-forge-pinning 2024.03.22.10.02.49 --- .github/CODEOWNERS | 2 +- README.md | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0525be0..52737ce 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @jan-janssen @niklassiemer @pmrv @pyiron-runner @srmnitc \ No newline at end of file +* @jan-janssen @pmrv @pyiron-runner @srmnitc \ No newline at end of file diff --git a/README.md b/README.md index bd8f113..d92d9be 100644 --- a/README.md +++ b/README.md @@ -144,7 +144,6 @@ Feedstock Maintainers ===================== * [@jan-janssen](https://github.com/jan-janssen/) -* [@niklassiemer](https://github.com/niklassiemer/) * [@pmrv](https://github.com/pmrv/) * [@pyiron-runner](https://github.com/pyiron-runner/) * [@srmnitc](https://github.com/srmnitc/) From 014c2ab4ac07f00be2fef69b8c9ac10b9b8bd7c4 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Wed, 3 Apr 2024 14:01:20 -0500 Subject: [PATCH 5/6] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 576eb99..9e132f1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -49,3 +49,4 @@ extra: - pyiron-runner - jan-janssen - pmrv + - niklasiemer From 2502a4c52147df6406e11ad76c587b2802dcc2d5 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 18:45:46 +0000 Subject: [PATCH 6/6] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and conda-forge-pinning 2024.04.03.17.55.34 --- .ci_support/linux_64_.yaml | 7 +++++++ .github/CODEOWNERS | 2 +- README.md | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 6c59082..3166d1d 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -6,3 +10,6 @@ channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +zip_keys: +- - c_stdlib_version + - cdt_name diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 52737ce..f5c0ff5 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @jan-janssen @pmrv @pyiron-runner @srmnitc \ No newline at end of file +* @jan-janssen @niklasiemer @pmrv @pyiron-runner @srmnitc \ No newline at end of file diff --git a/README.md b/README.md index d92d9be..3ed480f 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,7 @@ Feedstock Maintainers ===================== * [@jan-janssen](https://github.com/jan-janssen/) +* [@niklasiemer](https://github.com/niklasiemer/) * [@pmrv](https://github.com/pmrv/) * [@pyiron-runner](https://github.com/pyiron-runner/) * [@srmnitc](https://github.com/srmnitc/)