diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 789310b..6160178 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -47,11 +47,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 045cb04..5075c75 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -66,7 +66,7 @@ jobs: if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml index c44c614..26e1299 100644 --- a/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml @@ -19,13 +19,13 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 mpi: - mpich mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/linux_64_mpimpichpython3.8.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.8.____cpython.yaml index e976d50..73aeccf 100644 --- a/.ci_support/linux_64_mpimpichpython3.8.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.8.____cpython.yaml @@ -19,13 +19,13 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 mpi: - mpich mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml index 11c1c8a..b3fa9f3 100644 --- a/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml @@ -19,13 +19,13 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 mpi: - mpich mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/linux_64_mpinompipython3.10.____cpython.yaml b/.ci_support/linux_64_mpinompipython3.10.____cpython.yaml index 75c8e76..a499253 100644 --- a/.ci_support/linux_64_mpinompipython3.10.____cpython.yaml +++ b/.ci_support/linux_64_mpinompipython3.10.____cpython.yaml @@ -19,13 +19,13 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 mpi: - nompi mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/linux_64_mpinompipython3.8.____cpython.yaml b/.ci_support/linux_64_mpinompipython3.8.____cpython.yaml index 7dc96cf..d344a4d 100644 --- a/.ci_support/linux_64_mpinompipython3.8.____cpython.yaml +++ b/.ci_support/linux_64_mpinompipython3.8.____cpython.yaml @@ -19,13 +19,13 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 mpi: - nompi mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/linux_64_mpinompipython3.9.____cpython.yaml b/.ci_support/linux_64_mpinompipython3.9.____cpython.yaml index 41364ec..e5b323f 100644 --- a/.ci_support/linux_64_mpinompipython3.9.____cpython.yaml +++ b/.ci_support/linux_64_mpinompipython3.9.____cpython.yaml @@ -19,13 +19,13 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 mpi: - nompi mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml index b853473..0aa5285 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml @@ -19,13 +19,13 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 mpi: - openmpi mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/linux_64_mpiopenmpipython3.8.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.8.____cpython.yaml index 0ac8858..3cb1d41 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.8.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.8.____cpython.yaml @@ -19,13 +19,13 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 mpi: - openmpi mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml index eec820a..56c5f56 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml @@ -19,13 +19,13 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 mpi: - openmpi mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/osx_64_mpimpichpython3.10.____cpython.yaml b/.ci_support/osx_64_mpimpichpython3.10.____cpython.yaml index 8f63087..9768b5a 100644 --- a/.ci_support/osx_64_mpimpichpython3.10.____cpython.yaml +++ b/.ci_support/osx_64_mpimpichpython3.10.____cpython.yaml @@ -17,7 +17,7 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: @@ -25,7 +25,7 @@ mpi: mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/osx_64_mpimpichpython3.8.____cpython.yaml b/.ci_support/osx_64_mpimpichpython3.8.____cpython.yaml index 7864e96..4df11fb 100644 --- a/.ci_support/osx_64_mpimpichpython3.8.____cpython.yaml +++ b/.ci_support/osx_64_mpimpichpython3.8.____cpython.yaml @@ -17,7 +17,7 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: @@ -25,7 +25,7 @@ mpi: mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/osx_64_mpimpichpython3.9.____cpython.yaml b/.ci_support/osx_64_mpimpichpython3.9.____cpython.yaml index f579827..f0ea2fa 100644 --- a/.ci_support/osx_64_mpimpichpython3.9.____cpython.yaml +++ b/.ci_support/osx_64_mpimpichpython3.9.____cpython.yaml @@ -17,7 +17,7 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: @@ -25,7 +25,7 @@ mpi: mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/osx_64_mpinompipython3.10.____cpython.yaml b/.ci_support/osx_64_mpinompipython3.10.____cpython.yaml index cc897c0..a96c54e 100644 --- a/.ci_support/osx_64_mpinompipython3.10.____cpython.yaml +++ b/.ci_support/osx_64_mpinompipython3.10.____cpython.yaml @@ -17,7 +17,7 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: @@ -25,7 +25,7 @@ mpi: mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/osx_64_mpinompipython3.8.____cpython.yaml b/.ci_support/osx_64_mpinompipython3.8.____cpython.yaml index 4e64d78..fb34547 100644 --- a/.ci_support/osx_64_mpinompipython3.8.____cpython.yaml +++ b/.ci_support/osx_64_mpinompipython3.8.____cpython.yaml @@ -17,7 +17,7 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: @@ -25,7 +25,7 @@ mpi: mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/osx_64_mpinompipython3.9.____cpython.yaml b/.ci_support/osx_64_mpinompipython3.9.____cpython.yaml index 735a83d..8c71c5b 100644 --- a/.ci_support/osx_64_mpinompipython3.9.____cpython.yaml +++ b/.ci_support/osx_64_mpinompipython3.9.____cpython.yaml @@ -17,7 +17,7 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: @@ -25,7 +25,7 @@ mpi: mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/osx_64_mpiopenmpipython3.10.____cpython.yaml b/.ci_support/osx_64_mpiopenmpipython3.10.____cpython.yaml index ffe275d..d0c58c9 100644 --- a/.ci_support/osx_64_mpiopenmpipython3.10.____cpython.yaml +++ b/.ci_support/osx_64_mpiopenmpipython3.10.____cpython.yaml @@ -17,7 +17,7 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: @@ -25,7 +25,7 @@ mpi: mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/osx_64_mpiopenmpipython3.8.____cpython.yaml b/.ci_support/osx_64_mpiopenmpipython3.8.____cpython.yaml index 933361a..10af024 100644 --- a/.ci_support/osx_64_mpiopenmpipython3.8.____cpython.yaml +++ b/.ci_support/osx_64_mpiopenmpipython3.8.____cpython.yaml @@ -17,7 +17,7 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: @@ -25,7 +25,7 @@ mpi: mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/osx_64_mpiopenmpipython3.9.____cpython.yaml b/.ci_support/osx_64_mpiopenmpipython3.9.____cpython.yaml index 825e4c3..b84beef 100644 --- a/.ci_support/osx_64_mpiopenmpipython3.9.____cpython.yaml +++ b/.ci_support/osx_64_mpiopenmpipython3.9.____cpython.yaml @@ -17,7 +17,7 @@ fortran_compiler: fortran_compiler_version: - '12' hdf5: -- 1.14.1 +- 1.14.2 macos_machine: - x86_64-apple-darwin13.4.0 mpi: @@ -25,7 +25,7 @@ mpi: mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index 2295364..2ad914f 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -7,13 +7,13 @@ channel_targets: cxx_compiler: - vs2019 hdf5: -- 1.14.1 +- 1.14.2 mpi: - nompi mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml index 5429446..b6ca686 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_python3.8.____cpython.yaml @@ -7,13 +7,13 @@ channel_targets: cxx_compiler: - vs2019 hdf5: -- 1.14.1 +- 1.14.2 mpi: - nompi mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index 1a4206f..44cbce1 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -7,13 +7,13 @@ channel_targets: cxx_compiler: - vs2019 hdf5: -- 1.14.1 +- 1.14.2 mpi: - nompi mpich: - '4' numpy: -- '1.21' +- '1.22' openmpi: - '4' openssl: diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index f169576..5ef2a19 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -55,7 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -71,6 +70,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml