diff --git a/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml index 3276639..e6d0586 100644 --- a/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.2 +- 1.14.0 numpy: - '1.20' pin_run_as_build: diff --git a/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml index 24637ea..598cacc 100644 --- a/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.2 +- 1.14.0 numpy: - '1.20' pin_run_as_build: diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml index 219f834..6e91267 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.2 +- 1.14.0 numpy: - '1.21' pin_run_as_build: diff --git a/.ci_support/migrations/hdf51122.yaml b/.ci_support/migrations/hdf51140.yaml similarity index 64% rename from .ci_support/migrations/hdf51122.yaml rename to .ci_support/migrations/hdf51140.yaml index f40d232..75219e7 100644 --- a/.ci_support/migrations/hdf51122.yaml +++ b/.ci_support/migrations/hdf51140.yaml @@ -3,5 +3,5 @@ __migrator: kind: version migration_number: 1 hdf5: -- 1.12.2 -migrator_ts: 1658944374.2290778 +- 1.14.0 +migrator_ts: 1675622758 diff --git a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml index b54a5f4..1d68c73 100644 --- a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler: cxx_compiler_version: - '14' hdf5: -- 1.12.2 +- 1.14.0 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml index 2308c70..b095b57 100644 --- a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler: cxx_compiler_version: - '14' hdf5: -- 1.12.2 +- 1.14.0 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml index 0e6ad2c..4eea6dd 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler: cxx_compiler_version: - '14' hdf5: -- 1.12.2 +- 1.14.0 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml index b91f27c..c69902b 100644 --- a/.ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler: cxx_compiler_version: - '14' hdf5: -- 1.12.2 +- 1.14.0 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml index 90f7104..b17fe0a 100644 --- a/.ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler: cxx_compiler_version: - '14' hdf5: -- 1.12.2 +- 1.14.0 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml index f033cf6..f16c640 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler: cxx_compiler_version: - '14' hdf5: -- 1.12.2 +- 1.14.0 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml index 0ece61d..702a342 100644 --- a/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 hdf5: -- 1.12.2 +- 1.14.0 numpy: - '1.20' pin_run_as_build: diff --git a/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml index 0e2f34c..1df12f1 100644 --- a/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 hdf5: -- 1.12.2 +- 1.14.0 numpy: - '1.20' pin_run_as_build: diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml index c5122cc..129b2ac 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 hdf5: -- 1.12.2 +- 1.14.0 numpy: - '1.21' pin_run_as_build: diff --git a/conda-forge.yml b/conda-forge.yml index 32cb0e0..481f07e 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,9 +1,9 @@ build_platform: osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main test_on_native_only: true -conda_build: - pkg_format: '2' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1fd91c7..579a93d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: build: skip: true # [py<38] - number: 0 + number: 1 entry_points: - cxi.image2pickle = dxtbx.command_line.image2pickle:run - cxi.image_average = dxtbx.command_line.image_average:run