From 0202cfed2ece9905f51551c2b24a9fecb1bc9d65 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 19 Jan 2024 16:13:28 +0000 Subject: [PATCH 1/2] updated v4.0.11 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b95e45c..f8b03ac 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.0.10" %} +{% set version = "4.0.11" %} package: name: jupyterlab @@ -6,7 +6,7 @@ package: source: url: https://pypi.io/packages/source/j/jupyterlab/jupyterlab-{{ version }}.tar.gz - sha256: 46177eb8ede70dc73be922ac99f8ef943bdc2dfbc6a31b353c4bde848a35dee1 + sha256: d1aec24712566bc25a36229788242778e498ca4088028e2f9aa156b8b7fdc8fc build: noarch: python From c09e0ced6e9f1af6769c47ac70c6d5c59ed72bbc Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 19 Jan 2024 16:13:31 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.19.13.31.20 --- .github/CODEOWNERS | 2 +- .gitignore | 13 ++++++++++++- .scripts/build_steps.sh | 6 ------ .scripts/run_docker_build.sh | 6 ++++++ README.md | 1 + 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 879306c..e1bd8cf 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @krassowski @afshin @blink1073 @bollwyvl @ellisonbg @fcollonval @ian-r-rose @jasongrout @jochym @jtpio \ No newline at end of file +* @afshin @blink1073 @bollwyvl @ellisonbg @fcollonval @ian-r-rose @jasongrout @jochym @jtpio @krassowski \ No newline at end of file diff --git a/.gitignore b/.gitignore index c002910..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,22 @@ # 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/** +# 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 5382195..f017291 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -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}" 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/README.md b/README.md index df6835c..3d8ba64 100644 --- a/README.md +++ b/README.md @@ -162,4 +162,5 @@ Feedstock Maintainers * [@jasongrout](https://github.com/jasongrout/) * [@jochym](https://github.com/jochym/) * [@jtpio](https://github.com/jtpio/) +* [@krassowski](https://github.com/krassowski/)