From 3bdfdc85b422eb011a2d1e5c3482951117f6859d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 11 Mar 2024 13:53:06 +0000 Subject: [PATCH 1/4] updated v8.5.20240311110950 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3088cf8..b5f2b6c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "8.5.20240102191335" %} +{% set version = "8.5.20240311110950" %} package: name: schema-salad @@ -6,7 +6,7 @@ package: source: url: https://pypi.io/packages/source/s/schema-salad/schema-salad-{{ version }}.tar.gz - sha256: 7d32704f50e3fc6c096dc162084bf00bebce70aa762cb4a897239a64ae00a20c + sha256: 76bd1d0792622c12c5882cc8448bb9ce9a6083ca7d0c02e7884f746dd011fedc build: number: 0 From 845a4b579054ca189f40d74eb80cb7fa8bcf957e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 11 Mar 2024 13:53:22 +0000 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.10.12.43.11 --- .gitignore | 13 ++++++++++++- .scripts/build_steps.sh | 12 +++--------- .scripts/run_docker_build.sh | 6 ++++++ .scripts/run_osx_build.sh | 6 +++--- build-locally.py | 5 +++-- 5 files changed, 27 insertions(+), 15 deletions(-) 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 eba1dfd..9121002 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 boa 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 boa 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}" @@ -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}" @@ -74,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${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/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb9..16daa69 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa 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 boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda build ./recipe -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/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 8a27639c84c716195bbf6ea2a6937d05d77cd479 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Mon, 11 Mar 2024 15:12:56 +0100 Subject: [PATCH 3/4] update deps. --- recipe/meta.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b5f2b6c..37455a6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,7 +24,7 @@ requirements: host: - python - pip - - mypy ==1.7.0 # setup.py needs this when SCHEMA_SALAD_USE_MYPYC=1 + - mypy ==1.9.0 # setup.py needs this when SCHEMA_SALAD_USE_MYPYC=1 - types-pkg_resources - types-requests - types-dataclasses @@ -32,25 +32,25 @@ requirements: - ruamel.yaml >=0.17.6,<0.19 # ruamel.yaml is needed for the type hints # the newer version: 0.15.99 has py.typed, which mypyc needs - - black >=19.10b0 # also needed for type hints + - black >=24 # also needed for type hints - rdflib >=4.2.2,<8.0.0 # more type hints - setuptools_scm >=8.0.4,<9 - - importlib_resources >=1.4 + - importlib_resources >=1.4 # [py<39] run: - python - setuptools - requests >=1.0 - ruamel.yaml >=0.17.6,<0.19 - rdflib >=4.2.2,<8.0.0 - - mistune >=2.0.3,<2.1 - - cachecontrol >=0.13,<0.14 + - mistune >=3,<3.1 + - cachecontrol >=0.13,<0.15 - filelock - black - - importlib_resources >=1.4 + - importlib_resources >=1.4 # [py<39] test: requires: - - pytest <7.5 + - pytest <9 - pytest-xdist - setuptools imports: From 78a7bcd629139071b8ad2da70a6d24f58ebd3fab Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Mon, 11 Mar 2024 15:18:02 +0100 Subject: [PATCH 4/4] update homepage --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 37455a6..be5c786 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -62,7 +62,7 @@ test: - python -m pytest --pyargs schema_salad -vv # [ not aarch64 ] about: - home: https://github.com/common-workflow-language/schema_salad + home: https://schema-salad.readthedocs.io/ license: Apache-2.0 license_family: APACHE license_file: LICENSE.txt