diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index c16c19e..5c2f926 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,16 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.10.____cpython: - CONFIG: linux_64_python3.10.____cpython + linux_64_numpy1.21python3.10.____cpython: + CONFIG: linux_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_python3.8.____cpython: - CONFIG: linux_64_python3.8.____cpython + linux_64_numpy1.21python3.8.____cpython: + CONFIG: linux_64_numpy1.21python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_python3.9.____cpython: - CONFIG: linux_64_python3.9.____cpython + linux_64_numpy1.21python3.9.____cpython: + CONFIG: linux_64_numpy1.21python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_numpy1.23python3.11.____cpython: + CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 65d2b58..6fa537e 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,23 +8,29 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_python3.10.____cpython: - CONFIG: osx_64_python3.10.____cpython + osx_64_numpy1.21python3.10.____cpython: + CONFIG: osx_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython + osx_64_numpy1.21python3.8.____cpython: + CONFIG: osx_64_numpy1.21python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____cpython: - CONFIG: osx_64_python3.9.____cpython + osx_64_numpy1.21python3.9.____cpython: + CONFIG: osx_64_numpy1.21python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.10.____cpython: - CONFIG: osx_arm64_python3.10.____cpython + osx_64_numpy1.23python3.11.____cpython: + CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython + osx_arm64_numpy1.21python3.10.____cpython: + CONFIG: osx_arm64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.9.____cpython: - CONFIG: osx_arm64_python3.9.____cpython + osx_arm64_numpy1.21python3.8.____cpython: + CONFIG: osx_arm64_numpy1.21python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.21python3.9.____cpython: + CONFIG: osx_arm64_numpy1.21python3.9.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.23python3.11.____cpython: + CONFIG: osx_arm64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 045cb04..fe514a3 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,17 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_python3.10.____cpython: - CONFIG: win_64_python3.10.____cpython + win_64_numpy1.21python3.10.____cpython: + CONFIG: win_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.8.____cpython: - CONFIG: win_64_python3.8.____cpython + win_64_numpy1.21python3.8.____cpython: + CONFIG: win_64_numpy1.21python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.9.____cpython: - CONFIG: win_64_python3.9.____cpython + win_64_numpy1.21python3.9.____cpython: + CONFIG: win_64_numpy1.21python3.9.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy1.23python3.11.____cpython: + CONFIG: win_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml index bdec1d8..3ecc7b0 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-comp7 numpy: diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.21python3.8.____cpython.yaml index e199d3a..ecbe232 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-comp7 numpy: diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.21python3.9.____cpython.yaml index 0450008..0193f77 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-comp7 numpy: diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..a8d700e --- /dev/null +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,36 @@ +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-comp7 +numpy: +- '1.23' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +python_impl: +- cpython +target_platform: +- linux-64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml index 1217bc5..278a906 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml index 22a7fe8..97b0407 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml index 47ffe1d..c05fe66 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..ae0b8c6 --- /dev/null +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,40 @@ +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-aarch64 +numpy: +- '1.23' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +python_impl: +- cpython +target_platform: +- linux-aarch64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_ppc64le_python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml index 459ac79..741a5b1 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_ppc64le_python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml index 07b5bc1..c077bc4 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_ppc64le_python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml index d1b14b0..081b849 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..1d11b04 --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,36 @@ +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-ppc64le +numpy: +- '1.23' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +python_impl: +- cpython +target_platform: +- linux-ppc64le +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml new file mode 100644 index 0000000..c00be95 --- /dev/null +++ b/.ci_support/migrations/python311.yaml @@ -0,0 +1,37 @@ +migrator_ts: 1666686085 +__migrator: + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: True + pr_limit: 60 + max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + +python: + - 3.11.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.23 +python_impl: + - cpython diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml similarity index 96% rename from .ci_support/osx_64_python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml index 36d2f30..cd151e1 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' llvm_openmp: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml similarity index 96% rename from .ci_support/osx_64_python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.21python3.8.____cpython.yaml index ff9934a..eadb380 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' llvm_openmp: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml similarity index 96% rename from .ci_support/osx_64_python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.21python3.9.____cpython.yaml index ec1ecad..5d31c62 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' llvm_openmp: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..1d8e252 --- /dev/null +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,38 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +llvm_openmp: +- '15' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.23' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +python_impl: +- cpython +target_platform: +- osx-64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml similarity index 96% rename from .ci_support/osx_arm64_python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml index 6270e57..8b3a2ef 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' llvm_openmp: -- '14' +- '15' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml similarity index 96% rename from .ci_support/osx_arm64_python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml index f29fb87..f9d2287 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' llvm_openmp: -- '14' +- '15' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml similarity index 96% rename from .ci_support/osx_arm64_python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml index cf8e0d1..b5e6c36 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' llvm_openmp: -- '14' +- '15' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..4fa8503 --- /dev/null +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,38 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +llvm_openmp: +- '15' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.23' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml similarity index 100% rename from .ci_support/win_64_python3.10.____cpython.yaml rename to .ci_support/win_64_numpy1.21python3.10.____cpython.yaml diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml similarity index 100% rename from .ci_support/win_64_python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.21python3.8.____cpython.yaml diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml similarity index 100% rename from .ci_support/win_64_python3.9.____cpython.yaml rename to .ci_support/win_64_numpy1.21python3.9.____cpython.yaml diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..5dcd582 --- /dev/null +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,26 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +numpy: +- '1.23' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +python_impl: +- cpython +target_platform: +- win-64 +tbb: +- '2021' +zip_keys: +- - python + - numpy + - python_impl diff --git a/.travis.yml b/.travis.yml index ca68b6f..9d2e49a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,32 +7,42 @@ language: generic matrix: include: - - env: CONFIG=linux_aarch64_python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux arch: arm64 dist: focal - - env: CONFIG=linux_aarch64_python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_numpy1.21python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux arch: arm64 dist: focal - - env: CONFIG=linux_aarch64_python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_numpy1.21python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux arch: arm64 dist: focal - - env: CONFIG=linux_ppc64le_python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_aarch64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_ppc64le_numpy1.21python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_numpy1.21python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le dist: focal - - env: CONFIG=linux_ppc64le_python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.21python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le dist: focal - - env: CONFIG=linux_ppc64le_python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.23python3.11.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le dist: focal diff --git a/README.md b/README.md index b52b853..bc15ec2 100644 --- a/README.md +++ b/README.md @@ -43,129 +43,171 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ab19df5..e460879 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,20 +1,19 @@ {% set name = "numba" %} -{% set version = "0.56.4" %} -{% set sha256 = "ab96b731fb9dee12b404b42b7c1fb82c119352648906a80526afa73658895b73" %} +{% set version = "0.57.0" %} +{% set sha256 = "2af6d81067a5bdc13960c6d2519dbabbf4d5d597cf75d640c5aeaefd48c6420a" %} package: name: numba version: {{ version }} source: - # url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - url: https://github.com/numba/{{ name }}/archive/{{ version }}.tar.gz + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz + # url: https://github.com/numba/numba/archive/{{ version }}.tar.gz sha256: {{ sha256 }} build: - number: 1 + number: 0 entry_points: - - pycc = numba.pycc:main - numba = numba.misc.numba_entry:main script: - export CC="${CC} -pthread" # [linux] @@ -24,7 +23,7 @@ build: # tbb-devel triggers hard dependency on tbb, this is not the case. - tbb skip: true # [python_impl == 'pypy'] - skip: true # [py<37] + skip: true # [py<38] requirements: build: @@ -40,31 +39,30 @@ requirements: - python - pip - setuptools - - llvmlite 0.39.* + - llvmlite 0.40.* - numpy - - tbb-devel 2021.*,<2021.6 + - tbb-devel 2021.6.0 run: - python - {{ pin_compatible('llvmlite', max_pin='x.x') }} - {{ pin_compatible('numpy') }} - importlib-metadata # [py < 39] - # needed for pkg_resources - - setuptools run_constrained: - - tbb 2021.* # [not (armv6l or armv7l or aarch64 or linux32 or ppc64le)] + - {{ pin_compatible('tbb') }} # avoid confusion from openblas bugs - - libopenblas !=0.3.6 # [x86_64] + - libopenblas !=0.3.6 # [x86_64] - libopenblas >=0.3.18, !=0.3.20 # [arm64] # CUDA 10.2 or later is required for CUDA support + - cuda-version >=10.2 - cudatoolkit >=10.2 # scipy 1.0 or later - scipy >=1.0 # NumPy has a hard upper limit. # Also NumPy 1.22.0, 1.22.1, 1.22.2 are all broken for ufuncs # xref: https://github.com/numba/numba/issues/7756 - - numpy >=1.18,!=1.22.0,!=1.22.1,!=1.22.2,<1.24 + - numpy >=1.21,!=1.22.0,!=1.22.1,!=1.22.2,<1.25 # CUDA Python 11.6 or later - cuda-python >=11.6 @@ -77,7 +75,7 @@ test: - scipy - ipython - setuptools - - tbb >=2021.0 + - tbb - llvm-openmp # [osx] # Need these for AOT. Do not init msvc as it may not be present - {{ compiler('c') }} # [not win] @@ -99,13 +97,11 @@ test: - numba.cuda.simulator.cudadrv - numba.cuda.tests - numba.cuda.tests.cudadrv - - numba.cuda.tests.cudadrv.data - numba.cuda.tests.cudapy - numba.cuda.tests.cudasim - numba.cuda.tests.nocuda - numba.experimental.jitclass - numba.np.ufunc - - numba.pycc - numba.scripts - numba.testing - numba.tests diff --git a/recipe/run_test.bat b/recipe/run_test.bat index c6dea55..a33722d 100644 --- a/recipe/run_test.bat +++ b/recipe/run_test.bat @@ -1,20 +1,22 @@ set NUMBA_DEVELOPER_MODE=1 set NUMBA_DISABLE_ERROR_MESSAGE_HIGHLIGHTING=1 +@rem Validate Numba dependencies +python -m pip check +if errorlevel 1 exit 1 + @rem Check Numba executables are there -pycc -h numba -h +if errorlevel 1 exit 1 @rem Run system info tool numba -s +if errorlevel 1 exit 1 @rem Check test discovery works python -m numba.tests.test_runtests +if errorlevel 1 exit 1 @rem Run the whole test suite python -m numba.runtests -m %CPU_COUNT% -b - -if errorlevel 1 exit 1 - -python -m pip check if errorlevel 1 exit 1 diff --git a/recipe/run_test.sh b/recipe/run_test.sh index f799d37..a35063a 100644 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -41,8 +41,10 @@ if [[ "$NUMPY_DETECTS_AVX512_SKX_NP_GT_122" == "True" ]]; then export NPY_DISABLE_CPU_FEATURES="AVX512_SKX" fi +# Validate Numba dependencies +python -m pip check + # Check Numba executables are there -pycc -h numba -h # run system info tool @@ -52,13 +54,12 @@ numba -s python -m numba.tests.test_runtests if [[ "$archstr" == 'aarch64' ]] || [[ "$archstr" == "ppc64le" ]]; then - echo 'Running only a slice of tests' - $SEGVCATCH python -m numba.runtests -b -j --random='0.15' --exclude-tags='long_running' -m $TEST_NPROCS -- numba.tests + echo "Skipping numba test suite on $archstr" + #echo 'Running only a random selection of tests' + #$SEGVCATCH python -m numba.runtests -b --random='0.15' --exclude-tags='long_running' -m $TEST_NPROCS -- numba.tests # Else run the whole test suite else echo 'Running all the tests except long_running' echo "Running: $SEGVCATCH python -m numba.runtests -b -m $TEST_NPROCS -- $TESTS_TO_RUN" $SEGVCATCH python -m numba.runtests -b --exclude-tags='long_running' -m $TEST_NPROCS -- $TESTS_TO_RUN fi - -pip check
VariantStatus
linux_64_python3.10.____cpythonlinux_64_numpy1.21python3.10.____cpython - variant + variant
linux_64_python3.8.____cpythonlinux_64_numpy1.21python3.8.____cpython - variant + variant
linux_64_python3.9.____cpythonlinux_64_numpy1.21python3.9.____cpython - variant + variant
linux_aarch64_python3.10.____cpythonlinux_64_numpy1.23python3.11.____cpython - variant + variant
linux_aarch64_python3.8.____cpythonlinux_aarch64_numpy1.21python3.10.____cpython - variant + variant
linux_aarch64_python3.9.____cpythonlinux_aarch64_numpy1.21python3.8.____cpython - variant + variant
linux_ppc64le_python3.10.____cpythonlinux_aarch64_numpy1.21python3.9.____cpython - variant + variant
linux_ppc64le_python3.8.____cpythonlinux_aarch64_numpy1.23python3.11.____cpython - variant + variant
linux_ppc64le_python3.9.____cpythonlinux_ppc64le_numpy1.21python3.10.____cpython - variant + variant
osx_64_python3.10.____cpythonlinux_ppc64le_numpy1.21python3.8.____cpython - variant + variant
osx_64_python3.8.____cpythonlinux_ppc64le_numpy1.21python3.9.____cpython - variant + variant
osx_64_python3.9.____cpythonlinux_ppc64le_numpy1.23python3.11.____cpython - variant + variant
osx_arm64_python3.10.____cpythonosx_64_numpy1.21python3.10.____cpython - variant + variant
osx_arm64_python3.8.____cpythonosx_64_numpy1.21python3.8.____cpython - variant + variant
osx_arm64_python3.9.____cpythonosx_64_numpy1.21python3.9.____cpython - variant + variant
win_64_python3.10.____cpythonosx_64_numpy1.23python3.11.____cpython - variant + variant
win_64_python3.8.____cpythonosx_arm64_numpy1.21python3.10.____cpython - variant + variant
win_64_python3.9.____cpythonosx_arm64_numpy1.21python3.8.____cpython - variant + variant + +
osx_arm64_numpy1.21python3.9.____cpython + + variant + +
osx_arm64_numpy1.23python3.11.____cpython + + variant + +
win_64_numpy1.21python3.10.____cpython + + variant + +
win_64_numpy1.21python3.8.____cpython + + variant + +
win_64_numpy1.21python3.9.____cpython + + variant + +
win_64_numpy1.23python3.11.____cpython + + variant