From 32710400ad7039d0156711ef882248651471d134 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 22 Feb 2024 20:42:07 +0000 Subject: [PATCH 1/3] updated v2.4.2 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 25d38e6..096e841 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "pyuvdata" %} -{% set version = "2.4.1" %} -{% set sha256 = "37e8184394d5db9a0b7195f801381926d4158dfc92acfe8a34adf20afa237a5e" %} +{% set version = "2.4.2" %} +{% set sha256 = "cec2a6630f3d3b39511548f94a557ec302057edd4096d5f99434e3d694291f2f" %} package: name: {{ name }} @@ -13,7 +13,7 @@ source: - warnings.patch build: - number: 1 + number: 0 script: - {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv skip: true # [py<=37]] From 594bb768ac7d4c9280876e40e9571dc4bb183e7e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 22 Feb 2024 20:42:17 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.22.13.57.26 --- .gitignore | 25 +++++++++++++++++++++++-- .scripts/build_steps.sh | 6 ------ .scripts/run_docker_build.sh | 6 ++++++ 3 files changed, 29 insertions(+), 8 deletions(-) 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 eba1dfd..beda247 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -57,12 +57,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 From de48070f16098ad26e43669bc3d78e9e5ca9745a Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Thu, 22 Feb 2024 20:39:53 -0500 Subject: [PATCH 3/3] Tests not compatible with pytest 8.x --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 096e841..3cc02b4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,7 +34,6 @@ requirements: - numpy # pyuvdata needs >=1.20 - pip - pyerfa >=2.0 - - pytest-runner - python - scipy >=1.5 - setuptools @@ -55,7 +54,7 @@ test: - astropy-healpix >=0.6 - astroquery >=0.4.4 - cython >=0.23 - - pytest >=6.2 + - pytest <8 - pytest-cases >=3.6.9 - pytest-xdist - python-casacore >=3.3 # [not win and py<311]