diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 136fe2d8..85d5e88a 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-12 + vmImage: macOS-13 strategy: matrix: osx_64_numpy2.0python3.10.____cpython: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d038ffd4..9b07e042 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -23,31 +23,16 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: C:\\bld\\ + MINIFORGE_HOME: C:\Miniforge UPLOAD_TEMP: D:\\tmp steps: - - task: PythonScript@0 - displayName: 'Download Miniforge' - inputs: - scriptSource: inline - script: | - import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' - path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" - urllib.request.urlretrieve(url, path) - - - script: | - start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge - displayName: Install Miniforge - - - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" - displayName: Add conda to PATH - - script: | call ".scripts\run_win_build.bat" displayName: Run Windows build env: + MINIFORGE_HOME: $(MINIFORGE_HOME) PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index f5fb124f..5571d209 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -38,8 +38,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -python_impl: -- cpython target_platform: - linux-64 zip_keys: @@ -50,5 +48,4 @@ zip_keys: - cdt_name - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index b880ca07..e11298c9 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -38,8 +38,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -python_impl: -- cpython target_platform: - linux-64 zip_keys: @@ -50,5 +48,4 @@ zip_keys: - cdt_name - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml index 33a3fa15..11860ceb 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -38,8 +38,6 @@ pin_run_as_build: max_pin: x.x python: - 3.12.* *_cpython -python_impl: -- cpython target_platform: - linux-64 zip_keys: @@ -50,5 +48,4 @@ zip_keys: - cdt_name - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/linux_64_numpy2.1python3.13.____cp313.yaml b/.ci_support/linux_64_numpy2.1python3.13.____cp313.yaml index eaf01ad1..a75e0cde 100644 --- a/.ci_support/linux_64_numpy2.1python3.13.____cp313.yaml +++ b/.ci_support/linux_64_numpy2.1python3.13.____cp313.yaml @@ -11,7 +11,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -38,8 +38,6 @@ pin_run_as_build: max_pin: x.x python: - 3.13.* *_cp313 -python_impl: -- cpython target_platform: - linux-64 zip_keys: @@ -50,5 +48,4 @@ zip_keys: - cdt_name - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index 6c1c0f6f..0fc3aa51 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -42,8 +42,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -python_impl: -- cpython target_platform: - linux-aarch64 zip_keys: @@ -54,5 +52,4 @@ zip_keys: - cdt_name - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index 095b3c11..c5a77a3e 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -42,8 +42,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -python_impl: -- cpython target_platform: - linux-aarch64 zip_keys: @@ -54,5 +52,4 @@ zip_keys: - cdt_name - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index 6aa37c2f..295529c6 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -42,8 +42,6 @@ pin_run_as_build: max_pin: x.x python: - 3.12.* *_cpython -python_impl: -- cpython target_platform: - linux-aarch64 zip_keys: @@ -54,5 +52,4 @@ zip_keys: - cdt_name - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.1python3.13.____cp313.yaml b/.ci_support/linux_aarch64_numpy2.1python3.13.____cp313.yaml index aaf0268b..c88bb641 100644 --- a/.ci_support/linux_aarch64_numpy2.1python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_numpy2.1python3.13.____cp313.yaml @@ -15,7 +15,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -42,8 +42,6 @@ pin_run_as_build: max_pin: x.x python: - 3.13.* *_cp313 -python_impl: -- cpython target_platform: - linux-aarch64 zip_keys: @@ -54,5 +52,4 @@ zip_keys: - cdt_name - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 5f2d4eef..3762177a 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -38,8 +38,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -python_impl: -- cpython target_platform: - linux-ppc64le zip_keys: @@ -50,5 +48,4 @@ zip_keys: - cdt_name - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index 29fabe9d..b0a2b84e 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -38,8 +38,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -python_impl: -- cpython target_platform: - linux-ppc64le zip_keys: @@ -50,5 +48,4 @@ zip_keys: - cdt_name - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index 877c5310..55b122a4 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -38,8 +38,6 @@ pin_run_as_build: max_pin: x.x python: - 3.12.* *_cpython -python_impl: -- cpython target_platform: - linux-ppc64le zip_keys: @@ -50,5 +48,4 @@ zip_keys: - cdt_name - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.1python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_numpy2.1python3.13.____cp313.yaml index 737d38b5..d032dc6b 100644 --- a/.ci_support/linux_ppc64le_numpy2.1python3.13.____cp313.yaml +++ b/.ci_support/linux_ppc64le_numpy2.1python3.13.____cp313.yaml @@ -11,7 +11,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -38,8 +38,6 @@ pin_run_as_build: max_pin: x.x python: - 3.13.* *_cp313 -python_impl: -- cpython target_platform: - linux-ppc64le zip_keys: @@ -50,5 +48,4 @@ zip_keys: - cdt_name - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/migrations/flang19.yaml b/.ci_support/migrations/flang19.yaml new file mode 100644 index 00000000..5d8e2dd6 --- /dev/null +++ b/.ci_support/migrations/flang19.yaml @@ -0,0 +1,13 @@ +__migrator: + kind: version + migration_number: 1 + build_number: 1 + commit_message: Rebuild for flang 19 + platform_allowlist: + - win-64 + override_cbc_keys: + - fortran_compiler_stub +migrator_ts: 1722763680.3089325 + +fortran_compiler_version: # [win64] + - 19 # [win64] diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python313.yaml index f0cf696d..798be65e 100644 --- a/.ci_support/migrations/python313.yaml +++ b/.ci_support/migrations/python313.yaml @@ -18,11 +18,6 @@ __migrator: - 3.7.* *_73_pypy - 3.8.* *_73_pypy - 3.9.* *_73_pypy - channel_sources: - # doesn't seem to work properly when using additional_zip_keys - - conda-forge - - conda-forge/label/python_rc,conda-forge - - conda-forge/label/python_rc,conda-forge/label/llvm_rc,conda-forge paused: false longterm: true pr_limit: 20 @@ -42,8 +37,6 @@ __migrator: python: - 3.13.* *_cp313 -channel_sources: -- conda-forge/label/python_rc,conda-forge # additional entries to add for zip_keys numpy: - 2.1 diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 72d3083a..de396e40 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -7,7 +7,7 @@ ace: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fortran_compiler: - gfortran fortran_compiler_version: @@ -40,8 +40,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -python_impl: -- cpython target_platform: - osx-64 zip_keys: @@ -50,5 +48,4 @@ zip_keys: - fortran_compiler_version - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index 64aa3b51..6fb7409c 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -7,7 +7,7 @@ ace: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fortran_compiler: - gfortran fortran_compiler_version: @@ -40,8 +40,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -python_impl: -- cpython target_platform: - osx-64 zip_keys: @@ -50,5 +48,4 @@ zip_keys: - fortran_compiler_version - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index e5a7eac3..f0c994d7 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -7,7 +7,7 @@ ace: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fortran_compiler: - gfortran fortran_compiler_version: @@ -40,8 +40,6 @@ pin_run_as_build: max_pin: x.x python: - 3.12.* *_cpython -python_impl: -- cpython target_platform: - osx-64 zip_keys: @@ -50,5 +48,4 @@ zip_keys: - fortran_compiler_version - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/osx_64_numpy2.1python3.13.____cp313.yaml b/.ci_support/osx_64_numpy2.1python3.13.____cp313.yaml index ed5b4498..edabff85 100644 --- a/.ci_support/osx_64_numpy2.1python3.13.____cp313.yaml +++ b/.ci_support/osx_64_numpy2.1python3.13.____cp313.yaml @@ -7,19 +7,19 @@ ace: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fortran_compiler: - gfortran fortran_compiler_version: @@ -40,8 +40,6 @@ pin_run_as_build: max_pin: x.x python: - 3.13.* *_cp313 -python_impl: -- cpython target_platform: - osx-64 zip_keys: @@ -50,5 +48,4 @@ zip_keys: - fortran_compiler_version - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 4a4e2777..bf4f28c7 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -7,7 +7,7 @@ ace: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fortran_compiler: - gfortran fortran_compiler_version: @@ -40,8 +40,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -python_impl: -- cpython target_platform: - osx-arm64 zip_keys: @@ -50,5 +48,4 @@ zip_keys: - fortran_compiler_version - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index 141661f4..9410046d 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -7,7 +7,7 @@ ace: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fortran_compiler: - gfortran fortran_compiler_version: @@ -40,8 +40,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -python_impl: -- cpython target_platform: - osx-arm64 zip_keys: @@ -50,5 +48,4 @@ zip_keys: - fortran_compiler_version - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index 60835e5a..ee3cd1aa 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -7,7 +7,7 @@ ace: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fortran_compiler: - gfortran fortran_compiler_version: @@ -40,8 +40,6 @@ pin_run_as_build: max_pin: x.x python: - 3.12.* *_cpython -python_impl: -- cpython target_platform: - osx-arm64 zip_keys: @@ -50,5 +48,4 @@ zip_keys: - fortran_compiler_version - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.1python3.13.____cp313.yaml b/.ci_support/osx_arm64_numpy2.1python3.13.____cp313.yaml index f73fa269..252d298d 100644 --- a/.ci_support/osx_arm64_numpy2.1python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_numpy2.1python3.13.____cp313.yaml @@ -7,19 +7,19 @@ ace: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fortran_compiler: - gfortran fortran_compiler_version: @@ -40,8 +40,6 @@ pin_run_as_build: max_pin: x.x python: - 3.13.* *_cp313 -python_impl: -- cpython target_platform: - osx-arm64 zip_keys: @@ -50,5 +48,4 @@ zip_keys: - fortran_compiler_version - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml index b8b18ff5..9285edde 100644 --- a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -5,11 +5,15 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: - vs2019 +fortran_compiler: +- flang +fortran_compiler_version: +- '19' libblas: - 3.9 *netlib libcblas: @@ -24,12 +28,9 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -python_impl: -- cpython target_platform: - win-64 zip_keys: - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml index fe80fcdb..0180627e 100644 --- a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -5,11 +5,15 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: - vs2019 +fortran_compiler: +- flang +fortran_compiler_version: +- '19' libblas: - 3.9 *netlib libcblas: @@ -24,12 +28,9 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -python_impl: -- cpython target_platform: - win-64 zip_keys: - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml index 3d162d08..9a2b76d8 100644 --- a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -5,11 +5,15 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: - vs2019 +fortran_compiler: +- flang +fortran_compiler_version: +- '19' libblas: - 3.9 *netlib libcblas: @@ -24,12 +28,9 @@ pin_run_as_build: max_pin: x.x python: - 3.12.* *_cpython -python_impl: -- cpython target_platform: - win-64 zip_keys: - - python - numpy - - python_impl - channel_sources diff --git a/.ci_support/win_64_numpy2.1python3.13.____cp313.yaml b/.ci_support/win_64_numpy2.1python3.13.____cp313.yaml index 1913d523..b84f68de 100644 --- a/.ci_support/win_64_numpy2.1python3.13.____cp313.yaml +++ b/.ci_support/win_64_numpy2.1python3.13.____cp313.yaml @@ -5,11 +5,15 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: - vs2019 +fortran_compiler: +- flang +fortran_compiler_version: +- '19' libblas: - 3.9 *netlib libcblas: @@ -24,12 +28,9 @@ pin_run_as_build: max_pin: x.x python: - 3.13.* *_cp313 -python_impl: -- cpython target_platform: - win-64 zip_keys: - - python - numpy - - python_impl - channel_sources diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 856f469d..827a29fb 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,13 +31,13 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" 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 "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 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -76,8 +76,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 420f051c..7f948c41 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -7,28 +7,39 @@ source .scripts/logging_utils.sh set -xe MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} +MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash -( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null - -MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" -curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" -rm -rf ${MINIFORGE_HOME} -bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} - -( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null +( startgroup "Provisioning base env with micromamba" ) 2> /dev/null +MICROMAMBA_VERSION="1.5.10-0" +if [[ "$(uname -m)" == "arm64" ]]; then + osx_arch="osx-arm64" +else + osx_arch="osx-64" +fi +MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" +MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" +echo "Downloading micromamba ${MICROMAMBA_VERSION}" +micromamba_exe="$(mktemp -d)/micromamba" +curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" +chmod +x "${micromamba_exe}" +echo "Creating environment" +"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ + --channel conda-forge \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" +mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" +echo "Cleaning up micromamba" +rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true +( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null -source ${MINIFORGE_HOME}/etc/profile.d/conda.sh +source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base 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 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 "conda-build>=24.1" + @@ -88,8 +99,8 @@ else ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index a45c34fd..d3c0345e 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -3,30 +3,52 @@ :: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also :: benefit from the improvement. -:: Note: we assume a Miniforge installation is available - :: INPUTS (required environment variables) :: CONFIG: name of the .ci_support/*.yaml file for this job :: CI: azure, github_actions, or unset +:: MINIFORGE_HOME: where to install the base conda environment :: UPLOAD_PACKAGES: true or false :: UPLOAD_ON_BRANCH: true or false setlocal enableextensions enabledelayedexpansion +if "%MINIFORGE_HOME%"=="" set "MINIFORGE_HOME=%USERPROFILE%\Miniforge3" +:: Remove trailing backslash, if present +if "%MINIFORGE_HOME:~-1%"=="\" set "MINIFORGE_HOME=%MINIFORGE_HOME:~0,-1%" +call :start_group "Provisioning base env with micromamba" +set "MAMBA_ROOT_PREFIX=%MINIFORGE_HOME%-micromamba-%RANDOM%" +set "MICROMAMBA_VERSION=1.5.10-0" +set "MICROMAMBA_URL=https://github.com/mamba-org/micromamba-releases/releases/download/%MICROMAMBA_VERSION%/micromamba-win-64" +set "MICROMAMBA_TMPDIR=%TMP%\micromamba-%RANDOM%" +set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" + +echo Downloading micromamba %MICROMAMBA_VERSION% +if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" +certutil -urlcache -split -f "%MICROMAMBA_URL%" "%MICROMAMBA_EXE%" +if !errorlevel! neq 0 exit /b !errorlevel! + +echo Creating environment +call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ + --channel conda-forge ^ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +if !errorlevel! neq 0 exit /b !errorlevel! +echo Moving pkgs cache from %MAMBA_ROOT_PREFIX% to %MINIFORGE_HOME% +move /Y "%MAMBA_ROOT_PREFIX%\pkgs" "%MINIFORGE_HOME%" +if !errorlevel! neq 0 exit /b !errorlevel! +echo Removing %MAMBA_ROOT_PREFIX% +del /S /Q "%MAMBA_ROOT_PREFIX%" +del /S /Q "%MICROMAMBA_TMPDIR%" +call :end_group + call :start_group "Configuring conda" :: Activate the base conda environment -call activate base +call "%MINIFORGE_HOME%\Scripts\activate.bat" :: Configure the solver set "CONDA_SOLVER=libmamba" if !errorlevel! neq 0 exit /b !errorlevel! set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" -:: Provision the necessary dependencies to build the recipe later -echo Installing dependencies -mamba.exe install 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 echo Setting up configuration setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml @@ -59,8 +81,8 @@ conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTR if !errorlevel! neq 0 exit /b !errorlevel! call :start_group "Inspecting artifacts" -:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 -WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts --recipe-dir ".\recipe" -m .ci_support\%CONFIG%.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" call :end_group :: Prepare some environment variables for the upload step diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5306da9..32da3d0c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,7 +2,32 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index eb84ad0b..975d8ed5 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,2 +1,4 @@ -channel_sources: # [win] - - conda-forge/label/python_rc,conda-forge/label/llvm_rc,conda-forge # [win] +c_compiler_version: # [osx] + - 18 # [osx] +cxx_compiler_version: # [osx] + - 18 # [osx] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8dae07f9..718a515b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -43,8 +43,6 @@ source: build: number: 0 skip: true # [py<310] - # pypy is currently broken and on its way out anyway - skip: true # [python_impl == "pypy"] requirements: build: @@ -60,15 +58,10 @@ requirements: - {{ compiler('c') }} - {{ stdlib('c') }} - {{ compiler('cxx') }} - - {{ compiler('fortran') }} # [unix] + - {{ compiler('fortran') }} # pythran code needs clang-cl on windows - clang # [win] - # use flang as fortran compiler on windows (uses clang driver) - - flang # [win] - # use llvm linker for both of the above - - lld # [win] host: - - compiler-rt # [win] - libblas - libcblas - liblapack @@ -98,7 +91,7 @@ outputs: - {{ compiler('c') }} - {{ stdlib('c') }} - {{ compiler('cxx') }} - - {{ compiler('fortran') }} # [unix] + - {{ compiler('fortran') }} host: - libblas - libcblas @@ -227,10 +220,8 @@ outputs: - {{ compiler('c') }} - {{ stdlib('c') }} - {{ compiler('cxx') }} - - {{ compiler('fortran') }} # [unix] + - {{ compiler('fortran') }} - clang # [win] - - flang # [win] - - lld # [win] - sed # [unix] - m2-sed # [win] host: