diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 17bb5c0..c453404 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_blas_implmklnumpy2.0python3.10.____cpython: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 913d176..519787b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -41,31 +41,16 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + MINIFORGE_HOME: D:\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_blas_implmklnumpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_blas_implmklnumpy2.0python3.10.____cpython.yaml index 73480b6..adc1502 100644 --- a/.ci_support/linux_64_blas_implmklnumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_blas_implmklnumpy2.0python3.10.____cpython.yaml @@ -17,7 +17,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -33,4 +33,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_64_blas_implmklnumpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_blas_implmklnumpy2.0python3.11.____cpython.yaml index 5d01c57..57dcdfb 100644 --- a/.ci_support/linux_64_blas_implmklnumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_blas_implmklnumpy2.0python3.11.____cpython.yaml @@ -17,7 +17,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -33,4 +33,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_64_blas_implmklnumpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_blas_implmklnumpy2.0python3.12.____cpython.yaml index 4a084e4..3e724f0 100644 --- a/.ci_support/linux_64_blas_implmklnumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_blas_implmklnumpy2.0python3.12.____cpython.yaml @@ -17,7 +17,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -33,4 +33,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_64_blas_implmklnumpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_blas_implmklnumpy2.0python3.9.____cpython.yaml index 5359cda..aed358a 100644 --- a/.ci_support/linux_64_blas_implmklnumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_64_blas_implmklnumpy2.0python3.9.____cpython.yaml @@ -17,7 +17,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -33,4 +33,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_64_blas_implmklnumpy2python3.13.____cp313.yaml b/.ci_support/linux_64_blas_implmklnumpy2python3.13.____cp313.yaml index 7b18f6e..ff1a373 100644 --- a/.ci_support/linux_64_blas_implmklnumpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_64_blas_implmklnumpy2python3.13.____cp313.yaml @@ -11,13 +11,13 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl_devel: -- '2023' +- '2024' numpy: - '2' pin_run_as_build: @@ -33,4 +33,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml index a13d9d1..08d4255 100644 --- a/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml @@ -17,7 +17,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -33,4 +33,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml index 67fb866..48443ec 100644 --- a/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml @@ -17,7 +17,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -33,4 +33,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml index c7a8740..291e5de 100644 --- a/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml @@ -17,7 +17,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -33,4 +33,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml index fe2cdbe..d17cb96 100644 --- a/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml @@ -17,7 +17,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -33,4 +33,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_64_blas_implnetlibnumpy2python3.13.____cp313.yaml b/.ci_support/linux_64_blas_implnetlibnumpy2python3.13.____cp313.yaml index b96118b..632f5d4 100644 --- a/.ci_support/linux_64_blas_implnetlibnumpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_64_blas_implnetlibnumpy2python3.13.____cp313.yaml @@ -11,13 +11,13 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl_devel: -- '2023' +- '2024' numpy: - '2' pin_run_as_build: @@ -33,4 +33,3 @@ zip_keys: - cdt_name - - python - numpy - - 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 789ce3d..0bf5829 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cdt_name - - python - numpy - - 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 f3f1367..d8e8ca9 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cdt_name - - python - numpy - - 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 1ea00b6..ded4cbb 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index 786f346..9a7ade2 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -35,4 +35,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml index b88074e..afd1bcd 100644 --- a/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_numpy2python3.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 docker_image: @@ -35,4 +35,3 @@ zip_keys: - cdt_name - - python - numpy - - 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 e58a0e6..b81cbfb 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -31,4 +31,3 @@ zip_keys: - cdt_name - - python - numpy - - 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 e60c33a..03e7574 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -31,4 +31,3 @@ zip_keys: - cdt_name - - python - numpy - - 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 753d01e..b0c1fc8 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -31,4 +31,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index f7fe82d..15993ae 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -31,4 +31,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml index 394b3fb..69e5f98 100644 --- a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_ppc64le_numpy2python3.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 docker_image: @@ -31,4 +31,3 @@ zip_keys: - cdt_name - - python - numpy - - channel_sources diff --git a/.ci_support/migrations/mkl2024.yaml b/.ci_support/migrations/mkl2024.yaml new file mode 100644 index 0000000..00b3fc7 --- /dev/null +++ b/.ci_support/migrations/mkl2024.yaml @@ -0,0 +1,11 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +migrator_ts: 1701976941.105781 +mkl: +- '2024' # [not osx] +- '2023' # [osx] +mkl_devel: +- '2024' # [not osx] +- '2023' # [osx] diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml index 5ee454a..bf3bbb4 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml @@ -33,4 +33,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml index e58feba..0a97a28 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml @@ -33,4 +33,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml index eedd201..cde1131 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml @@ -33,4 +33,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml index 54a03ab..42ffe19 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml @@ -33,4 +33,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/osx_64_blas_implmklnumpy2python3.13.____cp313.yaml b/.ci_support/osx_64_blas_implmklnumpy2python3.13.____cp313.yaml index 53f1a07..7251467 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2python3.13.____cp313.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main macos_machine: @@ -33,4 +33,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml index 391bcd7..b09a6d8 100644 --- a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml @@ -33,4 +33,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml index 0a43ed8..a45cb1d 100644 --- a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml @@ -33,4 +33,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml index 0d4df0a..6ed5f42 100644 --- a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml @@ -33,4 +33,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml index 0641f4c..3b8ad6c 100644 --- a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml @@ -33,4 +33,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/osx_64_blas_implnetlibnumpy2python3.13.____cp313.yaml b/.ci_support/osx_64_blas_implnetlibnumpy2python3.13.____cp313.yaml index 74f8eb8..83ec3a4 100644 --- a/.ci_support/osx_64_blas_implnetlibnumpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_64_blas_implnetlibnumpy2python3.13.____cp313.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main macos_machine: @@ -33,4 +33,3 @@ target_platform: zip_keys: - - python - numpy - - 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 fa4bcbb..171a75c 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -31,4 +31,3 @@ target_platform: zip_keys: - - python - numpy - - 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 0d50f2b..7b2db38 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -31,4 +31,3 @@ target_platform: zip_keys: - - python - numpy - - 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 976e35f..4cccca5 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -31,4 +31,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index 4ea12d5..6ab8265 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -31,4 +31,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml index 8c54fe1..e270d47 100644 --- a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main macos_machine: @@ -31,4 +31,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/win_64_blas_implmklnumpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_blas_implmklnumpy2.0python3.10.____cpython.yaml index fcfa246..142635d 100644 --- a/.ci_support/win_64_blas_implmklnumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/win_64_blas_implmklnumpy2.0python3.10.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/win_64_blas_implmklnumpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_blas_implmklnumpy2.0python3.11.____cpython.yaml index 753e9c5..6d41baa 100644 --- a/.ci_support/win_64_blas_implmklnumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/win_64_blas_implmklnumpy2.0python3.11.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/win_64_blas_implmklnumpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_blas_implmklnumpy2.0python3.12.____cpython.yaml index 38174c5..916bb7d 100644 --- a/.ci_support/win_64_blas_implmklnumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/win_64_blas_implmklnumpy2.0python3.12.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/win_64_blas_implmklnumpy2.0python3.9.____cpython.yaml b/.ci_support/win_64_blas_implmklnumpy2.0python3.9.____cpython.yaml index 6118391..92c6785 100644 --- a/.ci_support/win_64_blas_implmklnumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/win_64_blas_implmklnumpy2.0python3.9.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/win_64_blas_implmklnumpy2python3.13.____cp313.yaml b/.ci_support/win_64_blas_implmklnumpy2python3.13.____cp313.yaml index 755a17a..1dcd944 100644 --- a/.ci_support/win_64_blas_implmklnumpy2python3.13.____cp313.yaml +++ b/.ci_support/win_64_blas_implmklnumpy2python3.13.____cp313.yaml @@ -5,11 +5,11 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main mkl_devel: -- '2023' +- '2024' numpy: - '2' pin_run_as_build: @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/win_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml index e79f098..4c07fcb 100644 --- a/.ci_support/win_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/win_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/win_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml index 633a048..ad02e12 100644 --- a/.ci_support/win_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/win_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/win_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml index 6fe18bd..dc39e44 100644 --- a/.ci_support/win_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/win_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/win_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml b/.ci_support/win_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml index 07cf5a7..c4491c6 100644 --- a/.ci_support/win_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/win_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main mkl_devel: -- '2023' +- '2024' numpy: - '2.0' pin_run_as_build: @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.ci_support/win_64_blas_implnetlibnumpy2python3.13.____cp313.yaml b/.ci_support/win_64_blas_implnetlibnumpy2python3.13.____cp313.yaml index 0baa20f..13e7e9b 100644 --- a/.ci_support/win_64_blas_implnetlibnumpy2python3.13.____cp313.yaml +++ b/.ci_support/win_64_blas_implnetlibnumpy2python3.13.____cp313.yaml @@ -5,11 +5,11 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main mkl_devel: -- '2023' +- '2024' numpy: - '2' pin_run_as_build: @@ -23,4 +23,3 @@ target_platform: zip_keys: - - python - numpy - - channel_sources diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251..827a29f 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,18 +31,20 @@ 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}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -74,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 420f051..7f948c4 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 65650bf..d3c0345 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 "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 echo Setting up configuration setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml @@ -48,7 +70,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group @@ -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 e5306da..32da3d0 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/build-locally.py b/build-locally.py index 8ac9b84..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,5 @@ #!/bin/sh -"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5c5c400..4058c06 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: folder: scs_source build: - number: 1 + number: 2 string: mkl_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [blas_impl == "mkl"] string: default_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [blas_impl != "mkl"] script: