diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 96d200c..961e409 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,26 +8,31 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.10.____cpython: - CONFIG: linux_64_python3.10.____cpython + linux_64_numpy2.0python3.10.____cpython: + CONFIG: linux_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_python3.10.____cpython - linux_64_python3.11.____cpython: - CONFIG: linux_64_python3.11.____cpython + SHORT_CONFIG: linux_64_numpy2.0python3.10.____cpython + linux_64_numpy2.0python3.11.____cpython: + CONFIG: linux_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_python3.11.____cpython - linux_64_python3.12.____cpython: - CONFIG: linux_64_python3.12.____cpython + SHORT_CONFIG: linux_64_numpy2.0python3.11.____cpython + linux_64_numpy2.0python3.12.____cpython: + CONFIG: linux_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_python3.12.____cpython - linux_64_python3.9.____cpython: - CONFIG: linux_64_python3.9.____cpython + SHORT_CONFIG: linux_64_numpy2.0python3.12.____cpython + linux_64_numpy2.0python3.9.____cpython: + CONFIG: linux_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_python3.9.____cpython + SHORT_CONFIG: linux_64_numpy2.0python3.9.____cpython + linux_64_numpy2python3.13.____cp313: + CONFIG: linux_64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_64_numpy2python3.13.____cp313 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index c53f4db..b4c3276 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,38 +8,46 @@ jobs: vmImage: macOS-13 strategy: matrix: - osx_64_python3.10.____cpython: - CONFIG: osx_64_python3.10.____cpython + osx_64_numpy2.0python3.10.____cpython: + CONFIG: osx_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_python3.10.____cpython - osx_64_python3.11.____cpython: - CONFIG: osx_64_python3.11.____cpython + SHORT_CONFIG: osx_64_numpy2.0python3.10.____cpython + osx_64_numpy2.0python3.11.____cpython: + CONFIG: osx_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_python3.11.____cpython - osx_64_python3.12.____cpython: - CONFIG: osx_64_python3.12.____cpython + SHORT_CONFIG: osx_64_numpy2.0python3.11.____cpython + osx_64_numpy2.0python3.12.____cpython: + CONFIG: osx_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_python3.12.____cpython - osx_64_python3.9.____cpython: - CONFIG: osx_64_python3.9.____cpython + SHORT_CONFIG: osx_64_numpy2.0python3.12.____cpython + osx_64_numpy2.0python3.9.____cpython: + CONFIG: osx_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_python3.9.____cpython - osx_arm64_python3.10.____cpython: - CONFIG: osx_arm64_python3.10.____cpython + SHORT_CONFIG: osx_64_numpy2.0python3.9.____cpython + osx_64_numpy2python3.13.____cp313: + CONFIG: osx_64_numpy2python3.13.____cp313 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_python3.10.____cpython - osx_arm64_python3.11.____cpython: - CONFIG: osx_arm64_python3.11.____cpython + SHORT_CONFIG: osx_64_numpy2python3.13.____cp313 + osx_arm64_numpy2.0python3.10.____cpython: + CONFIG: osx_arm64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_python3.11.____cpython - osx_arm64_python3.12.____cpython: - CONFIG: osx_arm64_python3.12.____cpython + SHORT_CONFIG: osx_arm64_numpy2.0python3.10.____cpython + osx_arm64_numpy2.0python3.11.____cpython: + CONFIG: osx_arm64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_python3.12.____cpython - osx_arm64_python3.9.____cpython: - CONFIG: osx_arm64_python3.9.____cpython + SHORT_CONFIG: osx_arm64_numpy2.0python3.11.____cpython + osx_arm64_numpy2.0python3.12.____cpython: + CONFIG: osx_arm64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_python3.9.____cpython + SHORT_CONFIG: osx_arm64_numpy2.0python3.12.____cpython + osx_arm64_numpy2.0python3.9.____cpython: + CONFIG: osx_arm64_numpy2.0python3.9.____cpython + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_numpy2.0python3.9.____cpython + osx_arm64_numpy2python3.13.____cp313: + CONFIG: osx_arm64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_numpy2python3.13.____cp313 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d92b1d6..7f8aa50 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,22 +8,26 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_python3.10.____cpython: - CONFIG: win_64_python3.10.____cpython + win_64_numpy2.0python3.10.____cpython: + CONFIG: win_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_python3.10.____cpython - win_64_python3.11.____cpython: - CONFIG: win_64_python3.11.____cpython + SHORT_CONFIG: win_64_numpy2.0python3.10.____cpython + win_64_numpy2.0python3.11.____cpython: + CONFIG: win_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_python3.11.____cpython - win_64_python3.12.____cpython: - CONFIG: win_64_python3.12.____cpython + SHORT_CONFIG: win_64_numpy2.0python3.11.____cpython + win_64_numpy2.0python3.12.____cpython: + CONFIG: win_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_python3.12.____cpython - win_64_python3.9.____cpython: - CONFIG: win_64_python3.9.____cpython + SHORT_CONFIG: win_64_numpy2.0python3.12.____cpython + win_64_numpy2.0python3.9.____cpython: + CONFIG: win_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_python3.9.____cpython + SHORT_CONFIG: win_64_numpy2.0python3.9.____cpython + win_64_numpy2python3.13.____cp313: + CONFIG: win_64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: win_64_numpy2python3.13.____cp313 timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_python3.11.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_python3.12.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml diff --git a/.ci_support/linux_64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..2f4b90f --- /dev/null +++ b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,41 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- cctbx-nightly main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_python3.11.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_python3.12.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml diff --git a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..1711e65 --- /dev/null +++ b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,41 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- cctbx-nightly main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml similarity index 100% rename from .ci_support/osx_arm64_python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml similarity index 100% rename from .ci_support/osx_arm64_python3.11.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml similarity index 100% rename from .ci_support/osx_arm64_python3.12.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml similarity index 100% rename from .ci_support/osx_arm64_python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml diff --git a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..219c18b --- /dev/null +++ b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,41 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- cctbx-nightly main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml similarity index 100% rename from .ci_support/win_64_python3.10.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.10.____cpython.yaml diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml similarity index 100% rename from .ci_support/win_64_python3.11.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.11.____cpython.yaml diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml similarity index 100% rename from .ci_support/win_64_python3.12.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.12.____cpython.yaml diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml similarity index 100% rename from .ci_support/win_64_python3.9.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.9.____cpython.yaml diff --git a/.ci_support/win_64_numpy2python3.13.____cp313.yaml b/.ci_support/win_64_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..497b535 --- /dev/null +++ b/.ci_support/win_64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,27 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- cctbx-nightly main +cxx_compiler: +- vs2019 +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/README.md b/README.md index 8b0f021..6c794b6 100644 --- a/README.md +++ b/README.md @@ -40,115 +40,143 @@ Current build status
Variant | Status | |
---|---|---|
linux_64_python3.10.____cpython | +linux_64_numpy2.0python3.10.____cpython |
- |
linux_64_python3.11.____cpython | +linux_64_numpy2.0python3.11.____cpython |
- |
linux_64_python3.12.____cpython | +linux_64_numpy2.0python3.12.____cpython |
- |
linux_64_python3.9.____cpython | +linux_64_numpy2.0python3.9.____cpython |
- |
osx_64_python3.10.____cpython | +linux_64_numpy2python3.13.____cp313 |
- |
osx_64_python3.11.____cpython | +osx_64_numpy2.0python3.10.____cpython |
- |
osx_64_python3.12.____cpython | +osx_64_numpy2.0python3.11.____cpython |
- |
osx_64_python3.9.____cpython | +osx_64_numpy2.0python3.12.____cpython |
- |
osx_arm64_python3.10.____cpython | +osx_64_numpy2.0python3.9.____cpython |
- |
osx_arm64_python3.11.____cpython | +osx_64_numpy2python3.13.____cp313 |
- |
osx_arm64_python3.12.____cpython | +osx_arm64_numpy2.0python3.10.____cpython |
- |
osx_arm64_python3.9.____cpython | +osx_arm64_numpy2.0python3.11.____cpython |
- |
win_64_python3.10.____cpython | +osx_arm64_numpy2.0python3.12.____cpython |
- |
win_64_python3.11.____cpython | +osx_arm64_numpy2.0python3.9.____cpython |
- |
win_64_python3.12.____cpython | +osx_arm64_numpy2python3.13.____cp313 |
- |
win_64_python3.9.____cpython | +win_64_numpy2.0python3.10.____cpython |
- |
+
win_64_numpy2.0python3.11.____cpython | +
+
+ |
+ |
win_64_numpy2.0python3.12.____cpython | +
+
+ |
+ |
win_64_numpy2.0python3.9.____cpython | +
+
+ |
+ |
win_64_numpy2python3.13.____cp313 | +
+
+ |