From 2f3cd8a74da779afd9c49539167cf52d4733674f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 28 Jul 2022 00:12:35 +0000 Subject: [PATCH 1/7] Rebuild for hdf51122 --- .ci_support/migrations/hdf51122.yaml | 7 +++++++ conda-forge.yml | 6 +++--- recipe/meta.yaml | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 .ci_support/migrations/hdf51122.yaml diff --git a/.ci_support/migrations/hdf51122.yaml b/.ci_support/migrations/hdf51122.yaml new file mode 100644 index 0000000..f40d232 --- /dev/null +++ b/.ci_support/migrations/hdf51122.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +hdf5: +- 1.12.2 +migrator_ts: 1658944374.2290778 diff --git a/conda-forge.yml b/conda-forge.yml index eae43ed..61df7af 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -3,11 +3,11 @@ build_platform: linux_ppc64le: linux_64 osx_arm64: osx_64 conda_forge_output_validation: true +github: + branch_name: main + tooling_branch_name: main provider: linux_aarch64: default linux_ppc64le: default win: azure test_on_native_only: true -github: - branch_name: main - tooling_branch_name: main diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e380fc9..02c560e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "3.7.0" %} -{% set build = 0 %} +{% set build = 1 %} # mpi must be defined for conda-smithy lint {% set mpi = mpi or 'nompi' %} From 38a7e2530b2181dcaf733123f73f56e9003afaf2 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 28 Jul 2022 00:15:08 +0000 Subject: [PATCH 2/7] MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.21.0, and conda-forge-pinning 2022.07.27.20.15.04 --- .azure-pipelines/azure-pipelines-win.yml | 69 ++++++------------- ...pimpichnumpy1.19python3.7.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.8.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.9.____cpython.yaml | 2 +- ...impichnumpy1.21python3.10.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.7.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.8.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.9.____cpython.yaml | 2 +- ...inompinumpy1.21python3.10.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.7.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.8.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.9.____cpython.yaml | 2 +- ...penmpinumpy1.21python3.10.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.7.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.8.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.9.____cpython.yaml | 2 +- ...impichnumpy1.21python3.10.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.7.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.8.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.9.____cpython.yaml | 2 +- ...inompinumpy1.21python3.10.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.7.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.8.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.9.____cpython.yaml | 2 +- ...penmpinumpy1.21python3.10.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.7.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.8.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.9.____cpython.yaml | 2 +- ...impichnumpy1.21python3.10.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.7.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.8.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.9.____cpython.yaml | 2 +- ...inompinumpy1.21python3.10.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.7.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.8.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.9.____cpython.yaml | 2 +- ...penmpinumpy1.21python3.10.____cpython.yaml | 2 +- .ci_support/migrations/hdf51121.yaml | 7 -- ...pimpichnumpy1.19python3.7.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.8.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.9.____cpython.yaml | 2 +- ...impichnumpy1.21python3.10.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.7.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.8.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.9.____cpython.yaml | 2 +- ...inompinumpy1.21python3.10.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.7.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.8.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.9.____cpython.yaml | 2 +- ...penmpinumpy1.21python3.10.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.8.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.9.____cpython.yaml | 2 +- ...impichnumpy1.21python3.10.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.8.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.9.____cpython.yaml | 2 +- ...inompinumpy1.21python3.10.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.8.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.9.____cpython.yaml | 2 +- ...penmpinumpy1.21python3.10.____cpython.yaml | 2 +- ...win_64_numpy1.19python3.7.____cpython.yaml | 2 +- ...win_64_numpy1.19python3.8.____cpython.yaml | 2 +- ...win_64_numpy1.19python3.9.____cpython.yaml | 2 +- ...in_64_numpy1.21python3.10.____cpython.yaml | 2 +- .circleci/config.yml | 3 +- .scripts/build_steps.sh | 9 ++- .scripts/run_osx_build.sh | 4 ++ LICENSE.txt | 30 +++++--- build-locally.py | 19 +++-- 68 files changed, 131 insertions(+), 132 deletions(-) delete mode 100644 .ci_support/migrations/hdf51121.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index ca970c2..08968f1 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -26,45 +26,27 @@ jobs: CONDA_BLD_PATH: D:\\bld\\ steps: - - script: | - choco install vcpython27 -fdv -y --debug - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Install vcpython27.msi (if needed) - - # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - # - script: rmdir C:\cygwin /s /q - # continueOnError: true - - - powershell: | - Set-PSDebug -Trace 1 - - $batchcontent = @" - ECHO ON - SET vcpython=C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0 - - DIR "%vcpython%" - - CALL "%vcpython%\vcvarsall.bat" %* - "@ - - $batchDir = "C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0\VC" - $batchPath = "$batchDir" + "\vcvarsall.bat" - New-Item -Path $batchPath -ItemType "file" -Force - - Set-Content -Value $batchcontent -Path $batchPath + - task: PythonScript@0 + displayName: 'Download Miniforge' + inputs: + scriptSource: inline + script: | + import urllib.request + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" + urllib.request.urlretrieve(url, path) - Get-ChildItem -Path $batchDir + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge - Get-ChildItem -Path ($batchDir + '\..') + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Patch vs2008 (if needed) - - task: CondaEnvironment@1 - inputs: - packageSpecs: 'python=3.9 conda-build conda pip boa conda-forge-ci-setup=3' # Optional - installOptions: "-c conda-forge" - updateConda: true - displayName: Install conda-build and activate environment + - script: | + call activate base + mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 displayName: Set PYTHONUNBUFFERED @@ -81,25 +63,16 @@ jobs: call activate base run_conda_forge_build_setup displayName: conda-forge build setup - - - # Special cased version setting some more things! - - script: | - call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml - displayName: Build recipe (vs2008) - env: - VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" - PYTHONUNBUFFERED: 1 - condition: contains(variables['CONFIG'], 'vs2008') - script: | call activate base + if EXIST LICENSE.txt ( + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" + ) conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables displayName: Build recipe env: PYTHONUNBUFFERED: 1 - condition: not(contains(variables['CONFIG'], 'vs2008')) - script: | set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" call activate base diff --git a/.ci_support/linux_64_mpimpichnumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_64_mpimpichnumpy1.19python3.7.____cpython.yaml index 483f7d6..83f95da 100644 --- a/.ci_support/linux_64_mpimpichnumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichnumpy1.19python3.7.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - mpich mpich: diff --git a/.ci_support/linux_64_mpimpichnumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_64_mpimpichnumpy1.19python3.8.____cpython.yaml index d2697f1..5dd71d9 100644 --- a/.ci_support/linux_64_mpimpichnumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichnumpy1.19python3.8.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - mpich mpich: diff --git a/.ci_support/linux_64_mpimpichnumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_mpimpichnumpy1.19python3.9.____cpython.yaml index 5d3f69a..53e80eb 100644 --- a/.ci_support/linux_64_mpimpichnumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichnumpy1.19python3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - mpich mpich: diff --git a/.ci_support/linux_64_mpimpichnumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_mpimpichnumpy1.21python3.10.____cpython.yaml index f5ae670..95ad80e 100644 --- a/.ci_support/linux_64_mpimpichnumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichnumpy1.21python3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - mpich mpich: diff --git a/.ci_support/linux_64_mpinompinumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_64_mpinompinumpy1.19python3.7.____cpython.yaml index 5de42e5..030fc2d 100644 --- a/.ci_support/linux_64_mpinompinumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_64_mpinompinumpy1.19python3.7.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/linux_64_mpinompinumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_64_mpinompinumpy1.19python3.8.____cpython.yaml index 9bd9c41..436b374 100644 --- a/.ci_support/linux_64_mpinompinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_64_mpinompinumpy1.19python3.8.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/linux_64_mpinompinumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_mpinompinumpy1.19python3.9.____cpython.yaml index 4adf389..158dad4 100644 --- a/.ci_support/linux_64_mpinompinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_mpinompinumpy1.19python3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/linux_64_mpinompinumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_mpinompinumpy1.21python3.10.____cpython.yaml index 333b6a0..58f102a 100644 --- a/.ci_support/linux_64_mpinompinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_mpinompinumpy1.21python3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/linux_64_mpiopenmpinumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_64_mpiopenmpinumpy1.19python3.7.____cpython.yaml index e5f1cac..853808f 100644 --- a/.ci_support/linux_64_mpiopenmpinumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpinumpy1.19python3.7.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - openmpi mpich: diff --git a/.ci_support/linux_64_mpiopenmpinumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_64_mpiopenmpinumpy1.19python3.8.____cpython.yaml index e4d9e61..b98a9c5 100644 --- a/.ci_support/linux_64_mpiopenmpinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpinumpy1.19python3.8.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - openmpi mpich: diff --git a/.ci_support/linux_64_mpiopenmpinumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_mpiopenmpinumpy1.19python3.9.____cpython.yaml index d6b6aaf..ec4c63d 100644 --- a/.ci_support/linux_64_mpiopenmpinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpinumpy1.19python3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - openmpi mpich: diff --git a/.ci_support/linux_64_mpiopenmpinumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_mpiopenmpinumpy1.21python3.10.____cpython.yaml index 52824c5..f9dc991 100644 --- a/.ci_support/linux_64_mpiopenmpinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpinumpy1.21python3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - openmpi mpich: diff --git a/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.7.____cpython.yaml index 94dfb89..d2369ca 100644 --- a/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.7.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - mpich mpich: diff --git a/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.8.____cpython.yaml index d117025..0089af6 100644 --- a/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.8.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - mpich mpich: diff --git a/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.9.____cpython.yaml index 97a6b32..058fae6 100644 --- a/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.9.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - mpich mpich: diff --git a/.ci_support/linux_aarch64_mpimpichnumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_mpimpichnumpy1.21python3.10.____cpython.yaml index 8c8d45b..24a27d3 100644 --- a/.ci_support/linux_aarch64_mpimpichnumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichnumpy1.21python3.10.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - mpich mpich: diff --git a/.ci_support/linux_aarch64_mpinompinumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.7.____cpython.yaml index b7a76ba..3ef3a9a 100644 --- a/.ci_support/linux_aarch64_mpinompinumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.7.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/linux_aarch64_mpinompinumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.8.____cpython.yaml index 34b2d06..fec9850 100644 --- a/.ci_support/linux_aarch64_mpinompinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.8.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/linux_aarch64_mpinompinumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.9.____cpython.yaml index 297681f..bb2aa9b 100644 --- a/.ci_support/linux_aarch64_mpinompinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.9.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/linux_aarch64_mpinompinumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_mpinompinumpy1.21python3.10.____cpython.yaml index 83b06b5..4ee6982 100644 --- a/.ci_support/linux_aarch64_mpinompinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpinompinumpy1.21python3.10.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpython.yaml index 5186309..2e64432 100644 --- a/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - openmpi mpich: diff --git a/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpython.yaml index 9fc19cb..d8424cf 100644 --- a/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - openmpi mpich: diff --git a/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpython.yaml index 96cfcc7..2e31872 100644 --- a/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - openmpi mpich: diff --git a/.ci_support/linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpython.yaml index 7d9701d..28d252e 100644 --- a/.ci_support/linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - openmpi mpich: diff --git a/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.7.____cpython.yaml index 1d0ce06..44e9d8f 100644 --- a/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.7.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - mpich mpich: diff --git a/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.8.____cpython.yaml index 1acadca..3182ae8 100644 --- a/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.8.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - mpich mpich: diff --git a/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.9.____cpython.yaml index a995259..035066d 100644 --- a/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - mpich mpich: diff --git a/.ci_support/linux_ppc64le_mpimpichnumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_mpimpichnumpy1.21python3.10.____cpython.yaml index 8995d30..56e3a19 100644 --- a/.ci_support/linux_ppc64le_mpimpichnumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpimpichnumpy1.21python3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - mpich mpich: diff --git a/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.7.____cpython.yaml index 7e51230..dcc48dc 100644 --- a/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.7.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.8.____cpython.yaml index d5f3a5f..4090b7b 100644 --- a/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.8.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.9.____cpython.yaml index bc6257c..58d6d6e 100644 --- a/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/linux_ppc64le_mpinompinumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_mpinompinumpy1.21python3.10.____cpython.yaml index de762b3..bc0d5bb 100644 --- a/.ci_support/linux_ppc64le_mpinompinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpinompinumpy1.21python3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpython.yaml index 44f15c4..3bcac34 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - openmpi mpich: diff --git a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpython.yaml index abc4aac..3b8edff 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - openmpi mpich: diff --git a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpython.yaml index 4bdb55c..6a6685a 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - openmpi mpich: diff --git a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpython.yaml index 1d697e8..7bcb61d 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.12.1 +- 1.12.2 mpi: - openmpi mpich: diff --git a/.ci_support/migrations/hdf51121.yaml b/.ci_support/migrations/hdf51121.yaml deleted file mode 100644 index 3f58c95..0000000 --- a/.ci_support/migrations/hdf51121.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -hdf5: -- 1.12.1 -migrator_ts: 1625881538.220744 diff --git a/.ci_support/osx_64_mpimpichnumpy1.19python3.7.____cpython.yaml b/.ci_support/osx_64_mpimpichnumpy1.19python3.7.____cpython.yaml index b5fca63..bc887a0 100644 --- a/.ci_support/osx_64_mpimpichnumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/osx_64_mpimpichnumpy1.19python3.7.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_64_mpimpichnumpy1.19python3.8.____cpython.yaml b/.ci_support/osx_64_mpimpichnumpy1.19python3.8.____cpython.yaml index 753c5d9..22bdcbe 100644 --- a/.ci_support/osx_64_mpimpichnumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/osx_64_mpimpichnumpy1.19python3.8.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_64_mpimpichnumpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_mpimpichnumpy1.19python3.9.____cpython.yaml index 1852b2c..538b8d7 100644 --- a/.ci_support/osx_64_mpimpichnumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_mpimpichnumpy1.19python3.9.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_64_mpimpichnumpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_mpimpichnumpy1.21python3.10.____cpython.yaml index 9a0440f..2fa6b38 100644 --- a/.ci_support/osx_64_mpimpichnumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_mpimpichnumpy1.21python3.10.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_64_mpinompinumpy1.19python3.7.____cpython.yaml b/.ci_support/osx_64_mpinompinumpy1.19python3.7.____cpython.yaml index 0ad5a4f..9631cd4 100644 --- a/.ci_support/osx_64_mpinompinumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/osx_64_mpinompinumpy1.19python3.7.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_64_mpinompinumpy1.19python3.8.____cpython.yaml b/.ci_support/osx_64_mpinompinumpy1.19python3.8.____cpython.yaml index d1a00e4..2bd9c9b 100644 --- a/.ci_support/osx_64_mpinompinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/osx_64_mpinompinumpy1.19python3.8.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_64_mpinompinumpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_mpinompinumpy1.19python3.9.____cpython.yaml index aeaaade..8b4367a 100644 --- a/.ci_support/osx_64_mpinompinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_mpinompinumpy1.19python3.9.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_64_mpinompinumpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_mpinompinumpy1.21python3.10.____cpython.yaml index 99dddc2..2f1340a 100644 --- a/.ci_support/osx_64_mpinompinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_mpinompinumpy1.21python3.10.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_64_mpiopenmpinumpy1.19python3.7.____cpython.yaml b/.ci_support/osx_64_mpiopenmpinumpy1.19python3.7.____cpython.yaml index 144f05c..ec45afd 100644 --- a/.ci_support/osx_64_mpiopenmpinumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/osx_64_mpiopenmpinumpy1.19python3.7.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_64_mpiopenmpinumpy1.19python3.8.____cpython.yaml b/.ci_support/osx_64_mpiopenmpinumpy1.19python3.8.____cpython.yaml index 3dea773..b7f612d 100644 --- a/.ci_support/osx_64_mpiopenmpinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/osx_64_mpiopenmpinumpy1.19python3.8.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_64_mpiopenmpinumpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_mpiopenmpinumpy1.19python3.9.____cpython.yaml index af538ae..0dff6d6 100644 --- a/.ci_support/osx_64_mpiopenmpinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_mpiopenmpinumpy1.19python3.9.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_64_mpiopenmpinumpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_mpiopenmpinumpy1.21python3.10.____cpython.yaml index 39b0bc5..82d8ece 100644 --- a/.ci_support/osx_64_mpiopenmpinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_mpiopenmpinumpy1.21python3.10.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_arm64_mpimpichnumpy1.19python3.8.____cpython.yaml b/.ci_support/osx_arm64_mpimpichnumpy1.19python3.8.____cpython.yaml index 69abb04..164d4a5 100644 --- a/.ci_support/osx_arm64_mpimpichnumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_mpimpichnumpy1.19python3.8.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - arm64-apple-darwin20.0.0 mpi: diff --git a/.ci_support/osx_arm64_mpimpichnumpy1.19python3.9.____cpython.yaml b/.ci_support/osx_arm64_mpimpichnumpy1.19python3.9.____cpython.yaml index 65c7c5d..9af371d 100644 --- a/.ci_support/osx_arm64_mpimpichnumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_mpimpichnumpy1.19python3.9.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - arm64-apple-darwin20.0.0 mpi: diff --git a/.ci_support/osx_arm64_mpimpichnumpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_mpimpichnumpy1.21python3.10.____cpython.yaml index 88cdb9a..0765b40 100644 --- a/.ci_support/osx_arm64_mpimpichnumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_mpimpichnumpy1.21python3.10.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - arm64-apple-darwin20.0.0 mpi: diff --git a/.ci_support/osx_arm64_mpinompinumpy1.19python3.8.____cpython.yaml b/.ci_support/osx_arm64_mpinompinumpy1.19python3.8.____cpython.yaml index 46b559e..6a1988a 100644 --- a/.ci_support/osx_arm64_mpinompinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_mpinompinumpy1.19python3.8.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - arm64-apple-darwin20.0.0 mpi: diff --git a/.ci_support/osx_arm64_mpinompinumpy1.19python3.9.____cpython.yaml b/.ci_support/osx_arm64_mpinompinumpy1.19python3.9.____cpython.yaml index 64c3efd..0b5e657 100644 --- a/.ci_support/osx_arm64_mpinompinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_mpinompinumpy1.19python3.9.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - arm64-apple-darwin20.0.0 mpi: diff --git a/.ci_support/osx_arm64_mpinompinumpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_mpinompinumpy1.21python3.10.____cpython.yaml index 2f0c4b0..e4b95fe 100644 --- a/.ci_support/osx_arm64_mpinompinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_mpinompinumpy1.21python3.10.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - arm64-apple-darwin20.0.0 mpi: diff --git a/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.8.____cpython.yaml b/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.8.____cpython.yaml index df6db95..9961f8a 100644 --- a/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.8.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - arm64-apple-darwin20.0.0 mpi: diff --git a/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.9.____cpython.yaml b/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.9.____cpython.yaml index 39ae2d7..3625d3d 100644 --- a/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.9.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - arm64-apple-darwin20.0.0 mpi: diff --git a/.ci_support/osx_arm64_mpiopenmpinumpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_mpiopenmpinumpy1.21python3.10.____cpython.yaml index 8386dea..3f8d883 100644 --- a/.ci_support/osx_arm64_mpiopenmpinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_mpiopenmpinumpy1.21python3.10.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 macos_machine: - arm64-apple-darwin20.0.0 mpi: diff --git a/.ci_support/win_64_numpy1.19python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.19python3.7.____cpython.yaml index 338ed8b..2a27ef9 100644 --- a/.ci_support/win_64_numpy1.19python3.7.____cpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.7.____cpython.yaml @@ -5,7 +5,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/win_64_numpy1.19python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.19python3.8.____cpython.yaml index 2679540..b28c146 100644 --- a/.ci_support/win_64_numpy1.19python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.8.____cpython.yaml @@ -5,7 +5,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml index 08795bb..5e4a20d 100644 --- a/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml index 0dfa60d..35149be 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml @@ -5,7 +5,7 @@ channel_sources: channel_targets: - conda-forge main hdf5: -- 1.12.1 +- 1.12.2 mpi: - nompi mpich: diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ad461b..3e61aa2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,8 @@ version: 2 jobs: build: working_directory: ~/test - machine: true + machine: + image: ubuntu-2004:current steps: - run: # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index c6b23e8..a6b09f6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -24,7 +24,10 @@ export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc < /dev/null +if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then + cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 3d85505..736a39a 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -61,6 +61,10 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then fi +if [[ -f LICENSE.txt ]]; then + cp LICENSE.txt "recipe/recipe-scripts-license.txt" +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/LICENSE.txt b/LICENSE.txt index 6ec1401..2ec51d7 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,13 +1,27 @@ -BSD 3-clause license +BSD-3-Clause license Copyright (c) 2015-2022, conda-forge contributors All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/build-locally.py b/build-locally.py index eec38a0..3f4b7a7 100755 --- a/build-locally.py +++ b/build-locally.py @@ -86,12 +86,19 @@ def main(args=None): verify_config(ns) setup_environment(ns) - if ns.config.startswith("linux") or ( - ns.config.startswith("osx") and platform.system() == "Linux" - ): - run_docker_build(ns) - elif ns.config.startswith("osx"): - run_osx_build(ns) + try: + if ns.config.startswith("linux") or ( + ns.config.startswith("osx") and platform.system() == "Linux" + ): + run_docker_build(ns) + elif ns.config.startswith("osx"): + run_osx_build(ns) + finally: + recipe_license_file = os.path.join( + "recipe", "recipe-scripts-license.txt" + ) + if os.path.exists(recipe_license_file): + os.remove(recipe_license_file) if __name__ == "__main__": From bb08b911ba9e7eb8e4ff2c6731c71f14d3233c0f Mon Sep 17 00:00:00 2001 From: "duncan.macleod" Date: Sun, 14 Aug 2022 10:28:11 +0100 Subject: [PATCH 3/7] don't cross-compile linux arch --- conda-forge.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 61df7af..8945d8a 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,6 +1,4 @@ build_platform: - linux_aarch64: linux_64 - linux_ppc64le: linux_64 osx_arm64: osx_64 conda_forge_output_validation: true github: @@ -9,5 +7,4 @@ github: provider: linux_aarch64: default linux_ppc64le: default - win: azure test_on_native_only: true From 4558c0ca42ed34cb794f375f672d301f845ba803 Mon Sep 17 00:00:00 2001 From: "duncan.macleod" Date: Sun, 14 Aug 2022 10:32:28 +0100 Subject: [PATCH 4/7] MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.21.1, and conda-forge-pinning 2022.08.13.16.03.46 --- .azure-pipelines/azure-pipelines-linux.yml | 97 ------------- .azure-pipelines/azure-pipelines-osx.yml | 3 +- .azure-pipelines/azure-pipelines-win.yml | 1 - ...pimpichnumpy1.19python3.7.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.8.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.9.____cpython.yaml | 2 +- ...impichnumpy1.21python3.10.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.7.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.8.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.9.____cpython.yaml | 2 +- ...inompinumpy1.21python3.10.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.7.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.8.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.9.____cpython.yaml | 2 +- ...penmpinumpy1.21python3.10.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.7.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.8.____cpython.yaml | 2 +- ...pimpichnumpy1.19python3.9.____cpython.yaml | 2 +- ...impichnumpy1.21python3.10.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.7.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.8.____cpython.yaml | 2 +- ...pinompinumpy1.19python3.9.____cpython.yaml | 2 +- ...inompinumpy1.21python3.10.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.7.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.8.____cpython.yaml | 2 +- ...openmpinumpy1.19python3.9.____cpython.yaml | 2 +- ...penmpinumpy1.21python3.10.____cpython.yaml | 2 +- .travis.yml | 137 ++++++++++++++++++ README.md | 9 +- 29 files changed, 170 insertions(+), 125 deletions(-) create mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 2402645..e030c7b 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -56,103 +56,6 @@ jobs: CONFIG: linux_64_mpiopenmpinumpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpimpichnumpy1.19python3.7.____cpython: - CONFIG: linux_aarch64_mpimpichnumpy1.19python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpimpichnumpy1.19python3.8.____cpython: - CONFIG: linux_aarch64_mpimpichnumpy1.19python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpimpichnumpy1.19python3.9.____cpython: - CONFIG: linux_aarch64_mpimpichnumpy1.19python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpimpichnumpy1.21python3.10.____cpython: - CONFIG: linux_aarch64_mpimpichnumpy1.21python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpinompinumpy1.19python3.7.____cpython: - CONFIG: linux_aarch64_mpinompinumpy1.19python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpinompinumpy1.19python3.8.____cpython: - CONFIG: linux_aarch64_mpinompinumpy1.19python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpinompinumpy1.19python3.9.____cpython: - CONFIG: linux_aarch64_mpinompinumpy1.19python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpinompinumpy1.21python3.10.____cpython: - CONFIG: linux_aarch64_mpinompinumpy1.21python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpython: - CONFIG: linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpython: - CONFIG: linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpython: - CONFIG: linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpython: - CONFIG: linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_mpimpichnumpy1.19python3.7.____cpython: - CONFIG: linux_ppc64le_mpimpichnumpy1.19python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_mpimpichnumpy1.19python3.8.____cpython: - CONFIG: linux_ppc64le_mpimpichnumpy1.19python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_mpimpichnumpy1.19python3.9.____cpython: - CONFIG: linux_ppc64le_mpimpichnumpy1.19python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_mpimpichnumpy1.21python3.10.____cpython: - CONFIG: linux_ppc64le_mpimpichnumpy1.21python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_mpinompinumpy1.19python3.7.____cpython: - CONFIG: linux_ppc64le_mpinompinumpy1.19python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_mpinompinumpy1.19python3.8.____cpython: - CONFIG: linux_ppc64le_mpinompinumpy1.19python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_mpinompinumpy1.19python3.9.____cpython: - CONFIG: linux_ppc64le_mpinompinumpy1.19python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_mpinompinumpy1.21python3.10.____cpython: - CONFIG: linux_ppc64le_mpinompinumpy1.21python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpython: - CONFIG: linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpython: - CONFIG: linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpython: - CONFIG: linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpython: - CONFIG: linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - maxParallel: 30 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 02bb106..f84f59f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-10.15 + vmImage: macOS-11 strategy: matrix: osx_64_mpimpichnumpy1.19python3.7.____cpython: @@ -71,7 +71,6 @@ jobs: osx_arm64_mpiopenmpinumpy1.21python3.10.____cpython: CONFIG: osx_arm64_mpiopenmpinumpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - maxParallel: 17 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 08968f1..3aa1b33 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -20,7 +20,6 @@ jobs: win_64_numpy1.21python3.10.____cpython: CONFIG: win_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - maxParallel: 3 timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.7.____cpython.yaml index d2369ca..8a0fdda 100644 --- a/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.7.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.8.____cpython.yaml index 0089af6..20743e2 100644 --- a/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.8.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.9.____cpython.yaml index 058fae6..a3f052d 100644 --- a/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.9.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_aarch64_mpimpichnumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_mpimpichnumpy1.21python3.10.____cpython.yaml index 24a27d3..acb3e0b 100644 --- a/.ci_support/linux_aarch64_mpimpichnumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichnumpy1.21python3.10.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_aarch64_mpinompinumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.7.____cpython.yaml index 3ef3a9a..d8b4db7 100644 --- a/.ci_support/linux_aarch64_mpinompinumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.7.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_aarch64_mpinompinumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.8.____cpython.yaml index fec9850..c2d5862 100644 --- a/.ci_support/linux_aarch64_mpinompinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.8.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_aarch64_mpinompinumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.9.____cpython.yaml index bb2aa9b..894cb59 100644 --- a/.ci_support/linux_aarch64_mpinompinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.9.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_aarch64_mpinompinumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_mpinompinumpy1.21python3.10.____cpython.yaml index 4ee6982..45ea007 100644 --- a/.ci_support/linux_aarch64_mpinompinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpinompinumpy1.21python3.10.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpython.yaml index 2e64432..f49c2d6 100644 --- a/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpython.yaml index d8424cf..1895061 100644 --- a/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpython.yaml index 2e31872..b16e9ed 100644 --- a/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpython.yaml index 28d252e..9afca51 100644 --- a/.ci_support/linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.7.____cpython.yaml index 44e9d8f..129f07a 100644 --- a/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.7.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.8.____cpython.yaml index 3182ae8..ae07cbe 100644 --- a/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.8.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.9.____cpython.yaml index 035066d..a40e1e3 100644 --- a/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.9.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_ppc64le_mpimpichnumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_mpimpichnumpy1.21python3.10.____cpython.yaml index 56e3a19..76dccd1 100644 --- a/.ci_support/linux_ppc64le_mpimpichnumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpimpichnumpy1.21python3.10.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.7.____cpython.yaml index dcc48dc..1d06a5a 100644 --- a/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.7.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.8.____cpython.yaml index 4090b7b..99248d1 100644 --- a/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.8.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.9.____cpython.yaml index 58d6d6e..b98126c 100644 --- a/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.9.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_ppc64le_mpinompinumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_mpinompinumpy1.21python3.10.____cpython.yaml index bc0d5bb..4ed34be 100644 --- a/.ci_support/linux_ppc64le_mpinompinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpinompinumpy1.21python3.10.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpython.yaml index 3bcac34..c30ad39 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpython.yaml index 3b8edff..9474264 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpython.yaml index 6a6685a..943d674 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le hdf5: - 1.12.2 mpi: diff --git a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpython.yaml index 7bcb61d..adbd9b2 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpython.yaml @@ -9,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le hdf5: - 1.12.2 mpi: diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..ec7bb75 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,137 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. + +language: generic + + + +matrix: + include: + - env: CONFIG=linux_aarch64_mpimpichnumpy1.19python3.7.____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_mpimpichnumpy1.19python3.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_mpimpichnumpy1.19python3.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_aarch64_mpimpichnumpy1.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_mpinompinumpy1.19python3.7.____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_mpinompinumpy1.19python3.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_mpinompinumpy1.19python3.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_aarch64_mpinompinumpy1.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_mpiopenmpinumpy1.19python3.7.____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_mpiopenmpinumpy1.19python3.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_mpiopenmpinumpy1.19python3.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_aarch64_mpiopenmpinumpy1.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_ppc64le_mpimpichnumpy1.19python3.7.____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_mpimpichnumpy1.19python3.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_mpimpichnumpy1.19python3.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_mpimpichnumpy1.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_mpinompinumpy1.19python3.7.____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_mpinompinumpy1.19python3.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_mpinompinumpy1.19python3.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_mpinompinumpy1.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_mpiopenmpinumpy1.19python3.7.____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_mpiopenmpinumpy1.19python3.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_mpiopenmpinumpy1.19python3.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_mpiopenmpinumpy1.21python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + +script: + - export CI=travis + - export GIT_BRANCH="$TRAVIS_BRANCH" + - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) + - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi + + + - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 2a7e915..0e2f2bc 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,14 @@ Current build status ==================== - +
+ + + From 62612cb117c62b71f39ef9fb1d2a7a22babf63cf Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 14 Aug 2022 03:43:06 -0700 Subject: [PATCH 5/7] Try to update osx arm build --- recipe/build.sh | 4 ++++ recipe/meta.yaml | 2 -- recipe/osx-arm64.diff | 11 ----------- 3 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 recipe/osx-arm64.diff diff --git a/recipe/build.sh b/recipe/build.sh index 6db6b9e..52c1abe 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -7,6 +7,10 @@ if [[ "$mpi" != "nompi" ]]; then export HDF5_MPI="ON" fi +if [[ ${target_platform} == "osx-arm64" ]]; then + export CIBW_ARCHS_MACOS=arm64 +fi + # tell setup.py to not 'pip install' exact package requirements export H5PY_SETUP_REQUIRES="0" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 02c560e..977d679 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,8 +16,6 @@ package: source: url: https://github.com/h5py/h5py/archive/{{ version }}.tar.gz sha256: 71ee0e0a25d6acc5e99ff13c287cae006604f6054dd9b60c352d0216e5d6b6f4 - patches: - - osx-arm64.diff # [osx and arm64] build: skip: true # [py<=36] diff --git a/recipe/osx-arm64.diff b/recipe/osx-arm64.diff deleted file mode 100644 index 201d5c7..0000000 --- a/recipe/osx-arm64.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- setup_build.py 2020-12-31 10:58:00.000000000 -0800 -+++ setup_build.py 2020-12-31 10:58:17.000000000 -0800 -@@ -158,7 +158,7 @@ - s %= { - 'mpi': bool(config.mpi), - 'version': config.hdf5_version, -- 'complex256_support': hasattr(numpy, 'complex256'), -+ 'complex256_support': False, - 'numpy_version': numpy.__version__, - 'cython_version': cython_version, - } From fcbb1ff94f345513851e78190b839529ac8a087b Mon Sep 17 00:00:00 2001 From: "duncan.macleod" Date: Sun, 14 Aug 2022 11:47:44 +0100 Subject: [PATCH 6/7] add hdf5 to requirements/build when cross-compiling Python's ctypes.CDLL can't open cross-compiled libraries --- recipe/build.sh | 7 ++++++- recipe/meta.yaml | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 52c1abe..6b31915 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,7 +1,12 @@ #!/bin/bash export HDF5_VERSION=${hdf5} -export HDF5_DIR=${PREFIX} +if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then + # load HDF5 library from _build_env + export HDF5_DIR=${BUILD_PREFIX} +else + export HDF5_DIR=${PREFIX} +fi export OPAL_PREFIX=${PREFIX} if [[ "$mpi" != "nompi" ]]; then export HDF5_MPI="ON" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 977d679..7c8fb72 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,6 +40,8 @@ requirements: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - cython # [build_platform != target_platform] + - hdf5 # [build_platform != target_platform] + - hdf5 * {{ mpi_prefix }}_* # [build_platform != target_platform] - numpy # [build_platform != target_platform] - {{ compiler("c") }} - {{ mpi }} # [mpi == 'openmpi' and build_platform != target_platform] From 72660c8e35778ad0e32bdaeb45d0065b90d54581 Mon Sep 17 00:00:00 2001 From: Duncan Macleod Date: Sun, 14 Aug 2022 13:34:41 +0100 Subject: [PATCH 7/7] add comment for CIBW_ARCHS_MACOS Co-authored-by: Mark Harfouche --- recipe/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build.sh b/recipe/build.sh index 6b31915..1db0f7b 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -13,6 +13,7 @@ if [[ "$mpi" != "nompi" ]]; then fi if [[ ${target_platform} == "osx-arm64" ]]; then + # disable complex256 on macOS ARM64, see https://github.com/h5py/h5py/pull/2065 export CIBW_ARCHS_MACOS=arm64 fi
Travis + + linux + +
Azure