diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 9cec39b..b306574 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -13,22 +13,23 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 SHORT_CONFIG: win_arm64_cl_version19.16.27033cros_h10441f7228 - win_arm64_cl_version19.29.30139cros_hdf27cf77b5: - CONFIG: win_arm64_cl_version19.29.30139cros_hdf27cf77b5 + win_arm64_cl_version19.29.30139cros_h5ab1bbeecd: + CONFIG: win_arm64_cl_version19.29.30139cros_h5ab1bbeecd UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: win_arm64_cl_version19.29.30139cros_hdf27cf77b5 - win_arm64_cl_version19.38.33130cros_h78f5b8adaf: - CONFIG: win_arm64_cl_version19.38.33130cros_h78f5b8adaf + SHORT_CONFIG: win_arm64_cl_version19.29.30139cros_h5ab1bbeecd + win_arm64_cl_version19.38.33135cros_had3617690f: + CONFIG: win_arm64_cl_version19.38.33135cros_had3617690f UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: win_arm64_cl_version19.38.33130cros_h78f5b8adaf - win_arm64_cl_version19.38.33130cros_h82d496f611: - CONFIG: win_arm64_cl_version19.38.33130cros_h82d496f611 + SHORT_CONFIG: win_arm64_cl_version19.38.33135cros_had3617690f + win_arm64_cl_version19.38.33135cros_he1295ab63f: + CONFIG: win_arm64_cl_version19.38.33135cros_he1295ab63f UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: win_arm64_cl_version19.38.33130cros_h82d496f611 + SHORT_CONFIG: win_arm64_cl_version19.38.33135cros_he1295ab63f timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a5bf301..9038b30 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -16,14 +16,14 @@ jobs: CONFIG: win_64_cl_version19.29.30139cross_t_h16fbe5123a UPLOAD_PACKAGES: 'True' SHORT_CONFIG: win_64_cl_version19.29.30139cross_t_h16fbe5123a - win_64_cl_version19.38.33130cross_t_hae6817084a: - CONFIG: win_64_cl_version19.38.33130cross_t_hae6817084a + win_64_cl_version19.38.33135cross_t_h57a3832d0b: + CONFIG: win_64_cl_version19.38.33135cross_t_h57a3832d0b UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_cl_version19.38.33130cross_t_hae6817084a - win_64_cl_version19.38.33130cross_t_hb91178803b: - CONFIG: win_64_cl_version19.38.33130cross_t_hb91178803b + SHORT_CONFIG: win_64_cl_version19.38.33135cross_t_h57a3832d0b + win_64_cl_version19.38.33135cross_t_hb850a121fd: + CONFIG: win_64_cl_version19.38.33135cross_t_hb850a121fd UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_cl_version19.38.33130cross_t_hb91178803b + SHORT_CONFIG: win_64_cl_version19.38.33135cross_t_hb850a121fd timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/win_64_cl_version19.38.33130cross_t_hae6817084a.yaml b/.ci_support/win_64_cl_version19.38.33135cross_t_h57a3832d0b.yaml similarity index 73% rename from .ci_support/win_64_cl_version19.38.33130cross_t_hae6817084a.yaml rename to .ci_support/win_64_cl_version19.38.33135cross_t_h57a3832d0b.yaml index c6c6847..5d94d43 100644 --- a/.ci_support/win_64_cl_version19.38.33130cross_t_hae6817084a.yaml +++ b/.ci_support/win_64_cl_version19.38.33135cross_t_h57a3832d0b.yaml @@ -3,19 +3,19 @@ channel_sources: channel_targets: - conda-forge main cl_version: -- 19.38.33130 +- 19.38.33135 cross_target_platform: - win-64 runtime_version: -- 14.38.33130 +- 14.38.33135 sha256: -- 4DFE83C91124CD542F4222FE2C396CABEAC617BB6F59BDCBDF89FD6F0DF0A32F +- 1AD7988C17663CC742B01BEF1A6DF2ED1741173009579AD50A94434E54F56073 target_platform: - win-64 update_version: -- '8' +- '9' uuid: -- a061be25-c14a-489a-8c7c-bb72adfb3cab +- c7707d68-d6ce-4479-973e-e2a3dc4341fe vc: - '14' vcver: diff --git a/.ci_support/win_64_cl_version19.38.33130cross_t_hb91178803b.yaml b/.ci_support/win_64_cl_version19.38.33135cross_t_hb850a121fd.yaml similarity index 73% rename from .ci_support/win_64_cl_version19.38.33130cross_t_hb91178803b.yaml rename to .ci_support/win_64_cl_version19.38.33135cross_t_hb850a121fd.yaml index b236b96..a59ed2c 100644 --- a/.ci_support/win_64_cl_version19.38.33130cross_t_hb91178803b.yaml +++ b/.ci_support/win_64_cl_version19.38.33135cross_t_hb850a121fd.yaml @@ -3,19 +3,19 @@ channel_sources: channel_targets: - conda-forge main cl_version: -- 19.38.33130 +- 19.38.33135 cross_target_platform: - win-arm64 runtime_version: -- 14.38.33130 +- 14.38.33135 sha256: -- BAC344CBC947DB8E306986BFB45A33052E1AAEE8F104ADBD9E461EB8199E27D2 +- 9378E04AE461E29CE5E46787D20F81700C80AD305B9417710D147C1D7FF0C970 target_platform: - win-64 update_version: -- '8' +- '9' uuid: -- a061be25-c14a-489a-8c7c-bb72adfb3cab +- 71c6392f-8df5-4b61-8d50-dba6a525fb9d vc: - '14' vcver: diff --git a/.ci_support/win_arm64_cl_version19.38.33130cros_h78f5b8adaf.yaml b/.ci_support/win_arm64_cl_version19.29.30139cros_h5ab1bbeecd.yaml similarity index 89% rename from .ci_support/win_arm64_cl_version19.38.33130cros_h78f5b8adaf.yaml rename to .ci_support/win_arm64_cl_version19.29.30139cros_h5ab1bbeecd.yaml index 5d3e8d2..6a3a146 100644 --- a/.ci_support/win_arm64_cl_version19.38.33130cros_h78f5b8adaf.yaml +++ b/.ci_support/win_arm64_cl_version19.29.30139cros_h5ab1bbeecd.yaml @@ -3,29 +3,29 @@ channel_sources: channel_targets: - conda-forge main cl_version: -- 19.38.33130 +- 19.29.30139 cross_target_platform: - win-64 docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 runtime_version: -- 14.38.33130 +- 14.29.30139 sha256: - 296F96CD102250636BCD23AB6E6CF70935337B1BBB3507FE8521D8D9CFAA932F target_platform: - win-arm64 update_version: -- '8' +- '11' uuid: - b929b7fe-5c89-4553-9abe-6324631dcc3a vc: - '14' vcver: -- '14.3' +- '14.2' vsver: -- '17' +- '16' vsyear: -- '2022' +- '2019' zip_keys: - - vcver - vsyear diff --git a/.ci_support/win_arm64_cl_version19.29.30139cros_hdf27cf77b5.yaml b/.ci_support/win_arm64_cl_version19.38.33135cros_had3617690f.yaml similarity index 71% rename from .ci_support/win_arm64_cl_version19.29.30139cros_hdf27cf77b5.yaml rename to .ci_support/win_arm64_cl_version19.38.33135cros_had3617690f.yaml index 81c808e..f5721da 100644 --- a/.ci_support/win_arm64_cl_version19.29.30139cros_hdf27cf77b5.yaml +++ b/.ci_support/win_arm64_cl_version19.38.33135cros_had3617690f.yaml @@ -3,29 +3,29 @@ channel_sources: channel_targets: - conda-forge main cl_version: -- 19.29.30139 +- 19.38.33135 cross_target_platform: - win-64 docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 runtime_version: -- 14.29.30139 +- 14.38.33135 sha256: -- 4DFE83C91124CD542F4222FE2C396CABEAC617BB6F59BDCBDF89FD6F0DF0A32F +- 1AD7988C17663CC742B01BEF1A6DF2ED1741173009579AD50A94434E54F56073 target_platform: - win-arm64 update_version: -- '11' +- '9' uuid: -- a061be25-c14a-489a-8c7c-bb72adfb3cab +- c7707d68-d6ce-4479-973e-e2a3dc4341fe vc: - '14' vcver: -- '14.2' +- '14.3' vsver: -- '16' +- '17' vsyear: -- '2019' +- '2022' zip_keys: - - vcver - vsyear diff --git a/.ci_support/win_arm64_cl_version19.38.33130cros_h82d496f611.yaml b/.ci_support/win_arm64_cl_version19.38.33135cros_he1295ab63f.yaml similarity index 76% rename from .ci_support/win_arm64_cl_version19.38.33130cros_h82d496f611.yaml rename to .ci_support/win_arm64_cl_version19.38.33135cros_he1295ab63f.yaml index 2fc12a2..b29dfb4 100644 --- a/.ci_support/win_arm64_cl_version19.38.33130cros_h82d496f611.yaml +++ b/.ci_support/win_arm64_cl_version19.38.33135cros_he1295ab63f.yaml @@ -3,21 +3,21 @@ channel_sources: channel_targets: - conda-forge main cl_version: -- 19.38.33130 +- 19.38.33135 cross_target_platform: - win-arm64 docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 runtime_version: -- 14.38.33130 +- 14.38.33135 sha256: -- BAC344CBC947DB8E306986BFB45A33052E1AAEE8F104ADBD9E461EB8199E27D2 +- 9378E04AE461E29CE5E46787D20F81700C80AD305B9417710D147C1D7FF0C970 target_platform: - win-arm64 update_version: -- '8' +- '9' uuid: -- a061be25-c14a-489a-8c7c-bb72adfb3cab +- 71c6392f-8df5-4b61-8d50-dba6a525fb9d vc: - '14' vcver: diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true 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..899ba03 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_win_build.bat b/.scripts/run_win_build.bat old mode 100644 new mode 100755 index 48734de..6d54697 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -55,7 +55,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/README.md b/README.md index 2a2b0f6..faaddaf 100644 --- a/README.md +++ b/README.md @@ -20,16 +20,16 @@ Home: https://visualstudio.microsoft.com/downloads/ Package license: LicenseRef-ProprietaryMicrosoft -Summary: MSVC runtimes associated with cl.exe version 19.38.33130 (VS 2022 update 8) +Summary: MSVC runtimes associated with cl.exe version 19.38.33135 (VS 2022 update 9) -About vs2017_win-64 +About vs2019_win-64 ------------------- Package license: BSD-3-Clause -Summary: Activation and version verification of MSVC 14.1 (VS 2017 compiler, update 9) +Summary: Activation and version verification of MSVC 14.2 (VS 2019 compiler, update 11) About vc -------- @@ -62,43 +62,43 @@ About vs_win-64 Package license: BSD-3-Clause -Summary: Activation and version verification of MSVC 14.2 (VS 2019 compiler, update 11) +Summary: Activation and version verification of MSVC 14.3 (VS 2022 compiler, update 9) -About vs2022_win-64 +About vs2017_win-64 ------------------- Package license: BSD-3-Clause -Summary: Activation and version verification of MSVC 14.3 (VS 2022 compiler, update 8) +Summary: Activation and version verification of MSVC 14.1 (VS 2017 compiler, update 9) -About vs2019_win-64 -------------------- +About vs2022_win-arm64 +---------------------- Package license: BSD-3-Clause -Summary: Activation and version verification of MSVC 14.2 (VS 2019 compiler, update 11) +Summary: Activation and version verification of MSVC 14.3 (VS 2022 compiler, update 9) -About vs2022_win-arm64 ----------------------- +About vs_win-arm64 +------------------ Package license: BSD-3-Clause -Summary: Activation and version verification of MSVC 14.3 (VS 2022 compiler, update 8) +Summary: Activation and version verification of MSVC 14.3 (VS 2022 compiler, update 9) -About vs_win-arm64 ------------------- +About vs2022_win-64 +------------------- Package license: BSD-3-Clause -Summary: Activation and version verification of MSVC 14.3 (VS 2022 compiler, update 8) +Summary: Activation and version verification of MSVC 14.3 (VS 2022 compiler, update 9) Current build status ==================== @@ -132,17 +132,17 @@ Current build status - win_64_cl_version19.38.33130cross_t_hae6817084a + win_64_cl_version19.38.33135cross_t_h57a3832d0b - variant + variant - win_64_cl_version19.38.33130cross_t_hb91178803b + win_64_cl_version19.38.33135cross_t_hb850a121fd - variant + variant @@ -153,24 +153,24 @@ Current build status - win_arm64_cl_version19.29.30139cros_hdf27cf77b5 + win_arm64_cl_version19.29.30139cros_h5ab1bbeecd - variant + variant - win_arm64_cl_version19.38.33130cros_h78f5b8adaf + win_arm64_cl_version19.38.33135cros_had3617690f - variant + variant - win_arm64_cl_version19.38.33130cros_h82d496f611 + win_arm64_cl_version19.38.33135cros_he1295ab63f - variant + variant 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." ) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index b782551..d822c52 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -16,35 +16,35 @@ vsver: runtime_version: # the azure/github images only contain the latest minor version per vs-line; # if there is a use-case for having older minor versions, they can be added when requested. - - 14.38.33130 - - 14.38.33130 + - 14.38.33135 + - 14.38.33135 - 14.29.30139 - 14.16.27033 # the VS update version. This is the middle digit in the version # reported in the VS help->about UI. It is perhaps a more readily # referenceable number. update_version: - - 8 - - 8 + - 9 + - 9 - 11 - 9 # This is the version number reported by cl.exe cl_version: - - 19.38.33130 - - 19.38.33130 + - 19.38.33135 + - 19.38.33135 - 19.29.30139 - 19.16.27033 # This is the uuid in the URL; redirect can be resolved e.g. as follows # curl -ILSs https://aka.ms/vs/17/release/vc_redist.x64.exe | grep "Location:" # curl -ILSs https://aka.ms/vs/17/release/vc_redist.arm64.exe | grep "Location:" uuid: - - a061be25-c14a-489a-8c7c-bb72adfb3cab - - a061be25-c14a-489a-8c7c-bb72adfb3cab + - 71c6392f-8df5-4b61-8d50-dba6a525fb9d + - c7707d68-d6ce-4479-973e-e2a3dc4341fe - b929b7fe-5c89-4553-9abe-6324631dcc3a - 4100b84d-1b4d-487d-9f89-1354a7138c8f sha256: - - BAC344CBC947DB8E306986BFB45A33052E1AAEE8F104ADBD9E461EB8199E27D2 - - 4DFE83C91124CD542F4222FE2C396CABEAC617BB6F59BDCBDF89FD6F0DF0A32F + - 9378E04AE461E29CE5E46787D20F81700C80AD305B9417710D147C1D7FF0C970 + - 1AD7988C17663CC742B01BEF1A6DF2ED1741173009579AD50A94434E54F56073 - 296F96CD102250636BCD23AB6E6CF70935337B1BBB3507FE8521D8D9CFAA932F - 5B0CBB977F2F5253B1EBE5C9D30EDBDA35DBD68FB70DE7AF5FAAC6423DB575B5 cross_target_platform: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0543f02..2f34c31 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,7 +16,7 @@ {% set vc_major = vcver.split(".")[0] %} {% set vcvars_ver = ".".join(runtime_version.split(".")[:2]) %} -{% set build_num = 18 %} +{% set build_num = 19 %} package: name: vs{{ vsyear }}