diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 843ac8f..3543f48 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,87 +8,72 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_mkl_supportmklnumpy1.22python3.10.____cpython: - CONFIG: linux_64_mkl_supportmklnumpy1.22python3.10.____cpython + linux_64_mkl_supportmklnumpy2.0python3.10.____cpythonpython_implcpython: + CONFIG: linux_64_mkl_supportmklnumpy2.0python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mkl_supportmklnumpy1.22python3.9.____73_pypy: - CONFIG: linux_64_mkl_supportmklnumpy1.22python3.9.____73_pypy + linux_64_mkl_supportmklnumpy2.0python3.11.____cpythonpython_implcpython: + CONFIG: linux_64_mkl_supportmklnumpy2.0python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mkl_supportmklnumpy1.22python3.9.____cpython: - CONFIG: linux_64_mkl_supportmklnumpy1.22python3.9.____cpython + linux_64_mkl_supportmklnumpy2.0python3.12.____cpythonpython_implcpython: + CONFIG: linux_64_mkl_supportmklnumpy2.0python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mkl_supportmklnumpy1.23python3.11.____cpython: - CONFIG: linux_64_mkl_supportmklnumpy1.23python3.11.____cpython + linux_64_mkl_supportmklnumpy2.0python3.9.____cpythonpython_implcpython: + CONFIG: linux_64_mkl_supportmklnumpy2.0python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mkl_supportmklnumpy1.26python3.12.____cpython: - CONFIG: linux_64_mkl_supportmklnumpy1.26python3.12.____cpython + linux_64_mkl_supportnomklnumpy2.0python3.10.____cpythonpython_implcpython: + CONFIG: linux_64_mkl_supportnomklnumpy2.0python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mkl_supportnomklnumpy1.22python3.10.____cpython: - CONFIG: linux_64_mkl_supportnomklnumpy1.22python3.10.____cpython + linux_64_mkl_supportnomklnumpy2.0python3.11.____cpythonpython_implcpython: + CONFIG: linux_64_mkl_supportnomklnumpy2.0python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mkl_supportnomklnumpy1.22python3.9.____73_pypy: - CONFIG: linux_64_mkl_supportnomklnumpy1.22python3.9.____73_pypy + linux_64_mkl_supportnomklnumpy2.0python3.12.____cpythonpython_implcpython: + CONFIG: linux_64_mkl_supportnomklnumpy2.0python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mkl_supportnomklnumpy1.22python3.9.____cpython: - CONFIG: linux_64_mkl_supportnomklnumpy1.22python3.9.____cpython + linux_64_mkl_supportnomklnumpy2.0python3.9.____cpythonpython_implcpython: + CONFIG: linux_64_mkl_supportnomklnumpy2.0python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mkl_supportnomklnumpy1.23python3.11.____cpython: - CONFIG: linux_64_mkl_supportnomklnumpy1.23python3.11.____cpython + linux_aarch64_numpy2.0python3.10.____cpythonpython_implcpython: + CONFIG: linux_aarch64_numpy2.0python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mkl_supportnomklnumpy1.26python3.12.____cpython: - CONFIG: linux_64_mkl_supportnomklnumpy1.26python3.12.____cpython + linux_aarch64_numpy2.0python3.11.____cpythonpython_implcpython: + CONFIG: linux_aarch64_numpy2.0python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.10.____cpython: - CONFIG: linux_aarch64_numpy1.22python3.10.____cpython + linux_aarch64_numpy2.0python3.12.____cpythonpython_implcpython: + CONFIG: linux_aarch64_numpy2.0python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.9.____73_pypy: - CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypy + linux_aarch64_numpy2.0python3.9.____cpythonpython_implcpython: + CONFIG: linux_aarch64_numpy2.0python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.9.____cpython: - CONFIG: linux_aarch64_numpy1.22python3.9.____cpython + linux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpython: + CONFIG: linux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.23python3.11.____cpython: - CONFIG: linux_aarch64_numpy1.23python3.11.____cpython + linux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpython: + CONFIG: linux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.26python3.12.____cpython: - CONFIG: linux_aarch64_numpy1.26python3.12.____cpython + linux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpython: + CONFIG: linux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.22python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.22python3.9.____73_pypy: - CONFIG: linux_ppc64le_numpy1.22python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.22python3.9.____cpython: - CONFIG: linux_ppc64le_numpy1.22python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.23python3.11.____cpython: - CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.26python3.12.____cpython: - CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython + linux_ppc64le_numpy2.0python3.9.____cpythonpython_implcpython: + CONFIG: linux_ppc64le_numpy2.0python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index f36bd1e..a66fa8b 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,37 +5,35 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.22python3.10.____cpython: - CONFIG: osx_64_numpy1.22python3.10.____cpython + osx_64_numpy2.0python3.10.____cpythonpython_implcpython: + CONFIG: osx_64_numpy2.0python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.9.____73_pypy: - CONFIG: osx_64_numpy1.22python3.9.____73_pypy + osx_64_numpy2.0python3.11.____cpythonpython_implcpython: + CONFIG: osx_64_numpy2.0python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.9.____cpython: - CONFIG: osx_64_numpy1.22python3.9.____cpython + osx_64_numpy2.0python3.12.____cpythonpython_implcpython: + CONFIG: osx_64_numpy2.0python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpython: - CONFIG: osx_64_numpy1.23python3.11.____cpython + osx_64_numpy2.0python3.9.____cpythonpython_implcpython: + CONFIG: osx_64_numpy2.0python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.26python3.12.____cpython: - CONFIG: osx_64_numpy1.26python3.12.____cpython + osx_arm64_numpy2.0python3.10.____cpython: + CONFIG: osx_arm64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.10.____cpython: - CONFIG: osx_arm64_numpy1.22python3.10.____cpython + osx_arm64_numpy2.0python3.11.____cpython: + CONFIG: osx_arm64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.9.____cpython: - CONFIG: osx_arm64_numpy1.22python3.9.____cpython + osx_arm64_numpy2.0python3.12.____cpython: + CONFIG: osx_arm64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.23python3.11.____cpython: - CONFIG: osx_arm64_numpy1.23python3.11.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.26python3.12.____cpython: - CONFIG: osx_arm64_numpy1.26python3.12.____cpython + osx_arm64_numpy2.0python3.9.____cpython: + CONFIG: osx_arm64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 92f0c39..2c1cd0f 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,35 +8,29 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_mkl_supportmklnumpy1.22python3.10.____cpython: - CONFIG: win_64_mkl_supportmklnumpy1.22python3.10.____cpython + win_64_mkl_supportmklnumpy2.0python3.10.____cpythonpython_implcpython: + CONFIG: win_64_mkl_supportmklnumpy2.0python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_mkl_supportmklnumpy1.22python3.9.____73_pypy: - CONFIG: win_64_mkl_supportmklnumpy1.22python3.9.____73_pypy + win_64_mkl_supportmklnumpy2.0python3.11.____cpythonpython_implcpython: + CONFIG: win_64_mkl_supportmklnumpy2.0python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_mkl_supportmklnumpy1.22python3.9.____cpython: - CONFIG: win_64_mkl_supportmklnumpy1.22python3.9.____cpython + win_64_mkl_supportmklnumpy2.0python3.12.____cpythonpython_implcpython: + CONFIG: win_64_mkl_supportmklnumpy2.0python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_mkl_supportmklnumpy1.23python3.11.____cpython: - CONFIG: win_64_mkl_supportmklnumpy1.23python3.11.____cpython + win_64_mkl_supportmklnumpy2.0python3.9.____cpythonpython_implcpython: + CONFIG: win_64_mkl_supportmklnumpy2.0python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_mkl_supportmklnumpy1.26python3.12.____cpython: - CONFIG: win_64_mkl_supportmklnumpy1.26python3.12.____cpython + win_64_mkl_supportnomklnumpy2.0python3.10.____cpythonpython_implcpython: + CONFIG: win_64_mkl_supportnomklnumpy2.0python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_mkl_supportnomklnumpy1.22python3.10.____cpython: - CONFIG: win_64_mkl_supportnomklnumpy1.22python3.10.____cpython + win_64_mkl_supportnomklnumpy2.0python3.11.____cpythonpython_implcpython: + CONFIG: win_64_mkl_supportnomklnumpy2.0python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_mkl_supportnomklnumpy1.22python3.9.____73_pypy: - CONFIG: win_64_mkl_supportnomklnumpy1.22python3.9.____73_pypy + win_64_mkl_supportnomklnumpy2.0python3.12.____cpythonpython_implcpython: + CONFIG: win_64_mkl_supportnomklnumpy2.0python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_mkl_supportnomklnumpy1.22python3.9.____cpython: - CONFIG: win_64_mkl_supportnomklnumpy1.22python3.9.____cpython - UPLOAD_PACKAGES: 'True' - win_64_mkl_supportnomklnumpy1.23python3.11.____cpython: - CONFIG: win_64_mkl_supportnomklnumpy1.23python3.11.____cpython - UPLOAD_PACKAGES: 'True' - win_64_mkl_supportnomklnumpy1.26python3.12.____cpython: - CONFIG: win_64_mkl_supportnomklnumpy1.26python3.12.____cpython + win_64_mkl_supportnomklnumpy2.0python3.9.____cpythonpython_implcpython: + CONFIG: win_64_mkl_supportnomklnumpy2.0python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_mkl_supportmklnumpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_64_mkl_supportmklnumpy1.22python3.9.____73_pypy.yaml deleted file mode 100644 index 197ac48..0000000 --- a/.ci_support/linux_64_mkl_supportmklnumpy1.22python3.9.____73_pypy.yaml +++ /dev/null @@ -1,37 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -mkl: -- '2023' -mkl_devel: -- '2023' -mkl_support: -- mkl -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/linux_64_mkl_supportmklnumpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_mkl_supportmklnumpy2.0python3.10.____cpythonpython_implcpython.yaml similarity index 73% rename from .ci_support/linux_64_mkl_supportmklnumpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_64_mkl_supportmklnumpy2.0python3.10.____cpythonpython_implcpython.yaml index 3965f5d..ac3c1fc 100644 --- a/.ci_support/linux_64_mkl_supportmklnumpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_mkl_supportmklnumpy2.0python3.10.____cpythonpython_implcpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -21,17 +25,22 @@ mkl_devel: mkl_support: - mkl numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.10.* *_cpython +python_impl: +- cpython target_platform: - linux-64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_64_mkl_supportmklnumpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_mkl_supportmklnumpy2.0python3.11.____cpythonpython_implcpython.yaml similarity index 73% rename from .ci_support/linux_64_mkl_supportmklnumpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_mkl_supportmklnumpy2.0python3.11.____cpythonpython_implcpython.yaml index a59f01f..d993e26 100644 --- a/.ci_support/linux_64_mkl_supportmklnumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_mkl_supportmklnumpy2.0python3.11.____cpythonpython_implcpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -21,17 +25,22 @@ mkl_devel: mkl_support: - mkl numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.11.* *_cpython +python_impl: +- cpython target_platform: - linux-64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_64_mkl_supportmklnumpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_mkl_supportmklnumpy2.0python3.12.____cpythonpython_implcpython.yaml similarity index 73% rename from .ci_support/linux_64_mkl_supportmklnumpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_64_mkl_supportmklnumpy2.0python3.12.____cpythonpython_implcpython.yaml index c4cd0aa..06133e7 100644 --- a/.ci_support/linux_64_mkl_supportmklnumpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_mkl_supportmklnumpy2.0python3.12.____cpythonpython_implcpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -21,17 +25,22 @@ mkl_devel: mkl_support: - mkl numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.12.* *_cpython +python_impl: +- cpython target_platform: - linux-64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_64_mkl_supportmklnumpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_mkl_supportmklnumpy2.0python3.9.____cpythonpython_implcpython.yaml similarity index 73% rename from .ci_support/linux_64_mkl_supportmklnumpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_64_mkl_supportmklnumpy2.0python3.9.____cpythonpython_implcpython.yaml index ad4ced1..7e986ec 100644 --- a/.ci_support/linux_64_mkl_supportmklnumpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_mkl_supportmklnumpy2.0python3.9.____cpythonpython_implcpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -21,17 +25,22 @@ mkl_devel: mkl_support: - mkl numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - linux-64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_64_mkl_supportnomklnumpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_64_mkl_supportnomklnumpy1.22python3.9.____73_pypy.yaml deleted file mode 100644 index 856a6dd..0000000 --- a/.ci_support/linux_64_mkl_supportnomklnumpy1.22python3.9.____73_pypy.yaml +++ /dev/null @@ -1,37 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -mkl: -- '2023' -mkl_devel: -- '2023' -mkl_support: -- nomkl -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/linux_64_mkl_supportnomklnumpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_mkl_supportnomklnumpy2.0python3.10.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/linux_64_mkl_supportnomklnumpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_64_mkl_supportnomklnumpy2.0python3.10.____cpythonpython_implcpython.yaml index b82806a..8446f1c 100644 --- a/.ci_support/linux_64_mkl_supportnomklnumpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_mkl_supportnomklnumpy2.0python3.10.____cpythonpython_implcpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -21,17 +25,22 @@ mkl_devel: mkl_support: - nomkl numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.10.* *_cpython +python_impl: +- cpython target_platform: - linux-64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_64_mkl_supportnomklnumpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_mkl_supportnomklnumpy2.0python3.11.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/linux_64_mkl_supportnomklnumpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_mkl_supportnomklnumpy2.0python3.11.____cpythonpython_implcpython.yaml index eab9eff..aeebd32 100644 --- a/.ci_support/linux_64_mkl_supportnomklnumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_mkl_supportnomklnumpy2.0python3.11.____cpythonpython_implcpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -21,17 +25,22 @@ mkl_devel: mkl_support: - nomkl numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.11.* *_cpython +python_impl: +- cpython target_platform: - linux-64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_64_mkl_supportnomklnumpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_mkl_supportnomklnumpy2.0python3.12.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/linux_64_mkl_supportnomklnumpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_64_mkl_supportnomklnumpy2.0python3.12.____cpythonpython_implcpython.yaml index c704100..81dead9 100644 --- a/.ci_support/linux_64_mkl_supportnomklnumpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_mkl_supportnomklnumpy2.0python3.12.____cpythonpython_implcpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -21,17 +25,22 @@ mkl_devel: mkl_support: - nomkl numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.12.* *_cpython +python_impl: +- cpython target_platform: - linux-64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_64_mkl_supportnomklnumpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_mkl_supportnomklnumpy2.0python3.9.____cpythonpython_implcpython.yaml similarity index 73% rename from .ci_support/linux_64_mkl_supportnomklnumpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_64_mkl_supportnomklnumpy2.0python3.9.____cpythonpython_implcpython.yaml index 105527c..dcd2fb5 100644 --- a/.ci_support/linux_64_mkl_supportnomklnumpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_mkl_supportnomklnumpy2.0python3.9.____cpythonpython_implcpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -21,17 +25,22 @@ mkl_devel: mkl_support: - nomkl numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - linux-64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml deleted file mode 100644 index d1201b1..0000000 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml +++ /dev/null @@ -1,35 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.10.____cpythonpython_implcpython.yaml index 971a0b0..12f724c 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpythonpython_implcpython.yaml @@ -4,12 +4,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -19,17 +23,22 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.10.* *_cpython +python_impl: +- cpython target_platform: - linux-aarch64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.11.____cpythonpython_implcpython.yaml index 4424de0..4c58a6d 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpythonpython_implcpython.yaml @@ -4,12 +4,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -19,17 +23,22 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.11.* *_cpython +python_impl: +- cpython target_platform: - linux-aarch64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.12.____cpythonpython_implcpython.yaml index 5642f8f..c605666 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpythonpython_implcpython.yaml @@ -4,12 +4,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -19,17 +23,22 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.12.* *_cpython +python_impl: +- cpython target_platform: - linux-aarch64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.9.____cpythonpython_implcpython.yaml index 67e0587..1118791 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpythonpython_implcpython.yaml @@ -4,12 +4,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -19,17 +23,22 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - linux-aarch64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml deleted file mode 100644 index 67b92b5..0000000 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml +++ /dev/null @@ -1,31 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpython.yaml similarity index 71% rename from .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpython.yaml index 779e396..2dd756e 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,17 +19,22 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.10.* *_cpython +python_impl: +- cpython target_platform: - linux-ppc64le zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpython.yaml similarity index 71% rename from .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpython.yaml index 7a59aac..472a64d 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,17 +19,22 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.11.* *_cpython +python_impl: +- cpython target_platform: - linux-ppc64le zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpython.yaml similarity index 71% rename from .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpython.yaml index 98a9e11..a4653b1 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,17 +19,22 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.12.* *_cpython +python_impl: +- cpython target_platform: - linux-ppc64le zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpythonpython_implcpython.yaml similarity index 71% rename from .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.9.____cpythonpython_implcpython.yaml index f56f9b9..36e3af7 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpythonpython_implcpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,17 +19,22 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - linux-ppc64le zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy + - python_impl diff --git a/.ci_support/migrations/numpy2.yaml b/.ci_support/migrations/numpy2.yaml new file mode 100644 index 0000000..79bbe52 --- /dev/null +++ b/.ci_support/migrations/numpy2.yaml @@ -0,0 +1,68 @@ +__migrator: + build_number: 1 + kind: version + commit_message: | + Rebuild for numpy 2.0 + + TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot + PR has updated the recipe to account for the changes (see below for details). + The numpy 2.0 package itself is currently only available from a special release + channel (`conda-forge/label/numpy_rc`) and will not be available on the main + `conda-forge` channel until the release of numpy 2.0 GA. + + The biggest change is that we no longer need to use the oldest available numpy + version at build time in order to support old numpy version at runtime - numpy + will by default use a compatible ABI for the oldest still-supported numpy versions. + + Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a + run requirement - this has been handled for more than two years now by a + run-export on the numpy package itself. The migrator will therefore remove + any occurrences of this. + + However, by default, building against numpy 2.0 will assume that the package + is compatible with numpy 2.0, which is not necessarily the case. You should + check that the upstream package explicitly supports numpy 2.0, otherwise you + need to add a `- numpy <2` run requirement until that happens (check numpy + issue 26191 for an overview of the most important packages). + + Note that the numpy release candidate promises to be ABI-compatible with the + final 2.0 release. This means that building against 2.0.0rc1 produces packages + that can be published to our main channels. + + If you already want to use the numpy 2.0 release candidate yourself, you can do + ``` + conda config --add channels conda-forge/label/numpy_rc + ``` + or add this channel to your `.condarc` file directly. + + ### To-Dos: + * [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility) + * If upstream is not yet compatible with numpy 2.0, add `numpy <2` upper bound under `run:`. + * If upstream is already compatible with numpy 2.0, nothing else should be necessary in most cases. + * If upstream requires a minimum numpy version newer than 1.19, you can add `numpy >=x.y` under `run:`. + * [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed. + + PS. If the build does not compile anymore, this is almost certainly a sign that + the upstream project is not yet ready for numpy 2.0; do not close this PR until + a version compatible with numpy 2.0 has been released upstream and on this + feedstock (in the meantime, you can keep the bot from reopening this PR in + case of git conflicts by marking it as a draft). + + migration_number: 1 + ordering: + # prefer channels including numpy_rc (otherwise smithy doesn't + # know which of the two values should be taken on merge) + channel_sources: + - conda-forge + - conda-forge/label/numpy_rc,conda-forge + +# needs to match length of zip {python, python_impl, numpy} +# as it is in global CBC in order to override it +numpy: + - 1.22 # no py38 support for numpy 2.0 + - 2.0 + - 2.0 + - 2.0 +channel_sources: + - conda-forge/label/numpy_rc,conda-forge +migrator_ts: 1713572489.295986 diff --git a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml deleted file mode 100644 index eba4abc..0000000 --- a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml +++ /dev/null @@ -1,31 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '16' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml similarity index 72% rename from .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml index fc42e94..ce655d5 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml @@ -1,11 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,13 +19,15 @@ cxx_compiler_version: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.10.* *_cpython +python_impl: +- cpython target_platform: - osx-64 zip_keys: @@ -29,3 +35,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml similarity index 72% rename from .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml index 68b895f..9f04598 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml @@ -1,11 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,13 +19,15 @@ cxx_compiler_version: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.11.* *_cpython +python_impl: +- cpython target_platform: - osx-64 zip_keys: @@ -29,3 +35,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml similarity index 72% rename from .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml index 14c2cc3..ed3d607 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml @@ -1,11 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,13 +19,15 @@ cxx_compiler_version: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.12.* *_cpython +python_impl: +- cpython target_platform: - osx-64 zip_keys: @@ -29,3 +35,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml similarity index 72% rename from .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml index b4d26bc..76f28fc 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml @@ -1,11 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,13 +19,15 @@ cxx_compiler_version: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - osx-64 zip_keys: @@ -29,3 +35,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml similarity index 74% rename from .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 7773ea2..285a19b 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -4,8 +4,12 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,13 +19,15 @@ cxx_compiler_version: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.10.* *_cpython +python_impl: +- cpython target_platform: - osx-arm64 zip_keys: @@ -29,3 +35,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml similarity index 74% rename from .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index 38f3e40..fe4a925 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -4,8 +4,12 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,13 +19,15 @@ cxx_compiler_version: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.11.* *_cpython +python_impl: +- cpython target_platform: - osx-arm64 zip_keys: @@ -29,3 +35,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml similarity index 74% rename from .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index 8ea9e4c..3929b45 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -4,8 +4,12 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,13 +19,15 @@ cxx_compiler_version: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.12.* *_cpython +python_impl: +- cpython target_platform: - osx-arm64 zip_keys: @@ -29,3 +35,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml similarity index 74% rename from .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index f90b501..a9db814 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -4,8 +4,12 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,13 +19,15 @@ cxx_compiler_version: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - osx-arm64 zip_keys: @@ -29,3 +35,4 @@ zip_keys: - cxx_compiler_version - - python - numpy + - python_impl diff --git a/.ci_support/win_64_mkl_supportmklnumpy1.22python3.9.____73_pypy.yaml b/.ci_support/win_64_mkl_supportmklnumpy1.22python3.9.____73_pypy.yaml deleted file mode 100644 index 5051b98..0000000 --- a/.ci_support/win_64_mkl_supportmklnumpy1.22python3.9.____73_pypy.yaml +++ /dev/null @@ -1,27 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -mkl: -- '2023' -mkl_devel: -- '2023' -mkl_support: -- mkl -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_mkl_supportmklnumpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_mkl_supportmklnumpy2.0python3.10.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/win_64_mkl_supportmklnumpy1.22python3.10.____cpython.yaml rename to .ci_support/win_64_mkl_supportmklnumpy2.0python3.10.____cpythonpython_implcpython.yaml index 0a3c7ad..c1bcb80 100644 --- a/.ci_support/win_64_mkl_supportmklnumpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_mkl_supportmklnumpy2.0python3.10.____cpythonpython_implcpython.yaml @@ -1,7 +1,9 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,15 +15,18 @@ mkl_devel: mkl_support: - mkl numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.10.* *_cpython +python_impl: +- cpython target_platform: - win-64 zip_keys: - - python - numpy + - python_impl diff --git a/.ci_support/win_64_mkl_supportmklnumpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_mkl_supportmklnumpy2.0python3.11.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/win_64_mkl_supportmklnumpy1.23python3.11.____cpython.yaml rename to .ci_support/win_64_mkl_supportmklnumpy2.0python3.11.____cpythonpython_implcpython.yaml index 5f14a8a..607fcb4 100644 --- a/.ci_support/win_64_mkl_supportmklnumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_mkl_supportmklnumpy2.0python3.11.____cpythonpython_implcpython.yaml @@ -1,7 +1,9 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,15 +15,18 @@ mkl_devel: mkl_support: - mkl numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.11.* *_cpython +python_impl: +- cpython target_platform: - win-64 zip_keys: - - python - numpy + - python_impl diff --git a/.ci_support/win_64_mkl_supportmklnumpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_mkl_supportmklnumpy2.0python3.12.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/win_64_mkl_supportmklnumpy1.26python3.12.____cpython.yaml rename to .ci_support/win_64_mkl_supportmklnumpy2.0python3.12.____cpythonpython_implcpython.yaml index 600d445..5a3a3eb 100644 --- a/.ci_support/win_64_mkl_supportmklnumpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_mkl_supportmklnumpy2.0python3.12.____cpythonpython_implcpython.yaml @@ -1,7 +1,9 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,15 +15,18 @@ mkl_devel: mkl_support: - mkl numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.12.* *_cpython +python_impl: +- cpython target_platform: - win-64 zip_keys: - - python - numpy + - python_impl diff --git a/.ci_support/win_64_mkl_supportmklnumpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_mkl_supportmklnumpy2.0python3.9.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/win_64_mkl_supportmklnumpy1.22python3.9.____cpython.yaml rename to .ci_support/win_64_mkl_supportmklnumpy2.0python3.9.____cpythonpython_implcpython.yaml index c62e257..c4059f7 100644 --- a/.ci_support/win_64_mkl_supportmklnumpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_mkl_supportmklnumpy2.0python3.9.____cpythonpython_implcpython.yaml @@ -1,7 +1,9 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,15 +15,18 @@ mkl_devel: mkl_support: - mkl numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - win-64 zip_keys: - - python - numpy + - python_impl diff --git a/.ci_support/win_64_mkl_supportnomklnumpy1.22python3.9.____73_pypy.yaml b/.ci_support/win_64_mkl_supportnomklnumpy1.22python3.9.____73_pypy.yaml deleted file mode 100644 index 0b283b5..0000000 --- a/.ci_support/win_64_mkl_supportnomklnumpy1.22python3.9.____73_pypy.yaml +++ /dev/null @@ -1,27 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -mkl: -- '2023' -mkl_devel: -- '2023' -mkl_support: -- nomkl -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_mkl_supportnomklnumpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_mkl_supportnomklnumpy2.0python3.10.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/win_64_mkl_supportnomklnumpy1.22python3.10.____cpython.yaml rename to .ci_support/win_64_mkl_supportnomklnumpy2.0python3.10.____cpythonpython_implcpython.yaml index 946f7cf..3e8d5e4 100644 --- a/.ci_support/win_64_mkl_supportnomklnumpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_mkl_supportnomklnumpy2.0python3.10.____cpythonpython_implcpython.yaml @@ -1,7 +1,9 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,15 +15,18 @@ mkl_devel: mkl_support: - nomkl numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.10.* *_cpython +python_impl: +- cpython target_platform: - win-64 zip_keys: - - python - numpy + - python_impl diff --git a/.ci_support/win_64_mkl_supportnomklnumpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_mkl_supportnomklnumpy2.0python3.11.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/win_64_mkl_supportnomklnumpy1.23python3.11.____cpython.yaml rename to .ci_support/win_64_mkl_supportnomklnumpy2.0python3.11.____cpythonpython_implcpython.yaml index c5113e6..ca1313c 100644 --- a/.ci_support/win_64_mkl_supportnomklnumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_mkl_supportnomklnumpy2.0python3.11.____cpythonpython_implcpython.yaml @@ -1,7 +1,9 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,15 +15,18 @@ mkl_devel: mkl_support: - nomkl numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.11.* *_cpython +python_impl: +- cpython target_platform: - win-64 zip_keys: - - python - numpy + - python_impl diff --git a/.ci_support/win_64_mkl_supportnomklnumpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_mkl_supportnomklnumpy2.0python3.12.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/win_64_mkl_supportnomklnumpy1.26python3.12.____cpython.yaml rename to .ci_support/win_64_mkl_supportnomklnumpy2.0python3.12.____cpythonpython_implcpython.yaml index c053caf..04d8696 100644 --- a/.ci_support/win_64_mkl_supportnomklnumpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_mkl_supportnomklnumpy2.0python3.12.____cpythonpython_implcpython.yaml @@ -1,7 +1,9 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,15 +15,18 @@ mkl_devel: mkl_support: - nomkl numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.12.* *_cpython +python_impl: +- cpython target_platform: - win-64 zip_keys: - - python - numpy + - python_impl diff --git a/.ci_support/win_64_mkl_supportnomklnumpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_mkl_supportnomklnumpy2.0python3.9.____cpythonpython_implcpython.yaml similarity index 74% rename from .ci_support/win_64_mkl_supportnomklnumpy1.22python3.9.____cpython.yaml rename to .ci_support/win_64_mkl_supportnomklnumpy2.0python3.9.____cpythonpython_implcpython.yaml index 283ce28..93ff45d 100644 --- a/.ci_support/win_64_mkl_supportnomklnumpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_mkl_supportnomklnumpy2.0python3.9.____cpythonpython_implcpython.yaml @@ -1,7 +1,9 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,15 +15,18 @@ mkl_devel: mkl_support: - nomkl numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - win-64 zip_keys: - - python - numpy + - python_impl diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index beda247..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}" @@ -68,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_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb9..07dff21 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/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 48734de..6d54697 100755 --- 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 6cb4b2e..5d95182 100644 --- a/README.md +++ b/README.md @@ -36,276 +36,227 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - 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 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/meta.yaml b/recipe/meta.yaml index 6001fa6..ec41817 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2.9.0" %} +{% set version = "2.10.0" %} {% set build = 0 %} {% set build_string = "" %} @@ -11,10 +11,12 @@ package: source: url: https://pypi.io/packages/source/n/numexpr/numexpr-{{ version }}.tar.gz - sha256: f21d12f6c432ce349089eb95342babf6629aebb3fddf187a4492d3aadaadaaf0 + sha256: c89e930752639df040539160326d8f99a84159bbea41943ab8e960591edaaef0 build: skip: true # [py<39] + # pypy not participating in numpy2 migration; numexpr not buildable anymore with numpy 1.x + skip: true # [python_impl == "pypy"] string: "{{ build_string }}py{{ py }}h{{ PKG_HASH }}_{{ build }}" number: {{ build }} script: bash {{ RECIPE_DIR }}/build_without_mkl.sh # [unix and not (linux64 and mkl_support == 'mkl')] @@ -26,6 +28,7 @@ requirements: - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} host: - mkl # [(linux64 or win64) and mkl_support == 'mkl'] @@ -38,7 +41,6 @@ requirements: - libblas * *mkl # [(linux64 or win64) and mkl_support == 'mkl'] - mkl # [(linux64 or win64) and mkl_support == 'mkl'] - nomkl # [(linux64 or win64) and mkl_support != 'mkl'] - - {{ pin_compatible('numpy') }} - python test:
VariantStatus
linux_64_mkl_supportmklnumpy1.22python3.10.____cpythonlinux_64_mkl_supportmklnumpy2.0python3.10.____cpythonpython_implcpython - variant + variant
linux_64_mkl_supportmklnumpy1.22python3.9.____73_pypylinux_64_mkl_supportmklnumpy2.0python3.11.____cpythonpython_implcpython - variant + variant
linux_64_mkl_supportmklnumpy1.22python3.9.____cpythonlinux_64_mkl_supportmklnumpy2.0python3.12.____cpythonpython_implcpython - variant + variant
linux_64_mkl_supportmklnumpy1.23python3.11.____cpythonlinux_64_mkl_supportmklnumpy2.0python3.9.____cpythonpython_implcpython - variant + variant
linux_64_mkl_supportmklnumpy1.26python3.12.____cpythonlinux_64_mkl_supportnomklnumpy2.0python3.10.____cpythonpython_implcpython - variant + variant
linux_64_mkl_supportnomklnumpy1.22python3.10.____cpythonlinux_64_mkl_supportnomklnumpy2.0python3.11.____cpythonpython_implcpython - variant + variant
linux_64_mkl_supportnomklnumpy1.22python3.9.____73_pypylinux_64_mkl_supportnomklnumpy2.0python3.12.____cpythonpython_implcpython - variant + variant
linux_64_mkl_supportnomklnumpy1.22python3.9.____cpythonlinux_64_mkl_supportnomklnumpy2.0python3.9.____cpythonpython_implcpython - variant + variant
linux_64_mkl_supportnomklnumpy1.23python3.11.____cpythonlinux_aarch64_numpy2.0python3.10.____cpythonpython_implcpython - variant + variant
linux_64_mkl_supportnomklnumpy1.26python3.12.____cpythonlinux_aarch64_numpy2.0python3.11.____cpythonpython_implcpython - variant + variant
linux_aarch64_numpy1.22python3.10.____cpythonlinux_aarch64_numpy2.0python3.12.____cpythonpython_implcpython - variant + variant
linux_aarch64_numpy1.22python3.9.____73_pypylinux_aarch64_numpy2.0python3.9.____cpythonpython_implcpython - variant + variant
linux_aarch64_numpy1.22python3.9.____cpythonlinux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpython - variant + variant
linux_aarch64_numpy1.23python3.11.____cpythonlinux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpython - variant + variant
linux_aarch64_numpy1.26python3.12.____cpythonlinux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpython - variant + variant
linux_ppc64le_numpy1.22python3.10.____cpythonlinux_ppc64le_numpy2.0python3.9.____cpythonpython_implcpython - variant + variant
linux_ppc64le_numpy1.22python3.9.____73_pypyosx_64_numpy2.0python3.10.____cpythonpython_implcpython - variant + variant
linux_ppc64le_numpy1.22python3.9.____cpythonosx_64_numpy2.0python3.11.____cpythonpython_implcpython - variant + variant
linux_ppc64le_numpy1.23python3.11.____cpythonosx_64_numpy2.0python3.12.____cpythonpython_implcpython - variant + variant
linux_ppc64le_numpy1.26python3.12.____cpythonosx_64_numpy2.0python3.9.____cpythonpython_implcpython - variant + variant
osx_64_numpy1.22python3.10.____cpythonosx_arm64_numpy2.0python3.10.____cpython - variant + variant
osx_64_numpy1.22python3.9.____73_pypyosx_arm64_numpy2.0python3.11.____cpython - variant + variant
osx_64_numpy1.22python3.9.____cpythonosx_arm64_numpy2.0python3.12.____cpython - variant + variant
osx_64_numpy1.23python3.11.____cpythonosx_arm64_numpy2.0python3.9.____cpython - variant + variant
osx_64_numpy1.26python3.12.____cpythonwin_64_mkl_supportmklnumpy2.0python3.10.____cpythonpython_implcpython - variant + variant
osx_arm64_numpy1.22python3.10.____cpythonwin_64_mkl_supportmklnumpy2.0python3.11.____cpythonpython_implcpython - variant + variant
osx_arm64_numpy1.22python3.9.____cpythonwin_64_mkl_supportmklnumpy2.0python3.12.____cpythonpython_implcpython - variant + variant
osx_arm64_numpy1.23python3.11.____cpythonwin_64_mkl_supportmklnumpy2.0python3.9.____cpythonpython_implcpython - variant + variant
osx_arm64_numpy1.26python3.12.____cpythonwin_64_mkl_supportnomklnumpy2.0python3.10.____cpythonpython_implcpython - variant + variant
win_64_mkl_supportmklnumpy1.22python3.10.____cpythonwin_64_mkl_supportnomklnumpy2.0python3.11.____cpythonpython_implcpython - variant + variant
win_64_mkl_supportmklnumpy1.22python3.9.____73_pypywin_64_mkl_supportnomklnumpy2.0python3.12.____cpythonpython_implcpython - variant + variant
win_64_mkl_supportmklnumpy1.22python3.9.____cpythonwin_64_mkl_supportnomklnumpy2.0python3.9.____cpythonpython_implcpython - variant - -
win_64_mkl_supportmklnumpy1.23python3.11.____cpython - - variant - -
win_64_mkl_supportmklnumpy1.26python3.12.____cpython - - variant - -
win_64_mkl_supportnomklnumpy1.22python3.10.____cpython - - variant - -
win_64_mkl_supportnomklnumpy1.22python3.9.____73_pypy - - variant - -
win_64_mkl_supportnomklnumpy1.22python3.9.____cpython - - variant - -
win_64_mkl_supportnomklnumpy1.23python3.11.____cpython - - variant - -
win_64_mkl_supportnomklnumpy1.26python3.12.____cpython - - variant + variant