Merge pull request #72 from mauzey1/cmor_3.9.0

Cmor 3.9.0
conda-forge · Aug 28, 2024 · 4c2adae · 4c2adae
2 parents f76ee2d + b81d11c
commit 4c2adae
Show file tree

Hide file tree

Showing 25 changed files with 86 additions and 345 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml
diff --git a/...ux_64_numpy2.0python3.10.____cpython.yaml → ...port/linux_64_python3.10.____cpython.yaml b/...ux_64_numpy2.0python3.10.____cpython.yaml → ...port/linux_64_python3.10.____cpython.yaml
@@ -1,13 +1,13 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -17,7 +17,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 hdf5:
 - 1.14.3
 json_c:

diff --git a/...ux_64_numpy2.0python3.11.____cpython.yaml → ...port/linux_64_python3.11.____cpython.yaml b/...ux_64_numpy2.0python3.11.____cpython.yaml → ...port/linux_64_python3.11.____cpython.yaml
@@ -1,13 +1,13 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -17,7 +17,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 hdf5:
 - 1.14.3
 json_c:

diff --git a/...ux_64_numpy2.0python3.12.____cpython.yaml → ...port/linux_64_python3.12.____cpython.yaml b/...ux_64_numpy2.0python3.12.____cpython.yaml → ...port/linux_64_python3.12.____cpython.yaml
@@ -1,13 +1,13 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -17,7 +17,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 hdf5:
 - 1.14.3
 json_c:

diff --git a/...nux_64_numpy2.0python3.9.____cpython.yaml → ...pport/linux_64_python3.9.____cpython.yaml b/...nux_64_numpy2.0python3.9.____cpython.yaml → ...pport/linux_64_python3.9.____cpython.yaml
@@ -1,13 +1,13 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -17,7 +17,7 @@ docker_image:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 hdf5:
 - 1.14.3
 json_c:

diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
diff --git a/...sx_64_numpy2.0python3.10.____cpython.yaml → ...upport/osx_64_python3.10.____cpython.yaml b/...sx_64_numpy2.0python3.10.____cpython.yaml → ...upport/osx_64_python3.10.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 hdf5:
 - 1.14.3
 json_c:

diff --git a/...sx_64_numpy2.0python3.11.____cpython.yaml → ...upport/osx_64_python3.11.____cpython.yaml b/...sx_64_numpy2.0python3.11.____cpython.yaml → ...upport/osx_64_python3.11.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 hdf5:
 - 1.14.3
 json_c:

diff --git a/...sx_64_numpy2.0python3.12.____cpython.yaml → ...upport/osx_64_python3.12.____cpython.yaml b/...sx_64_numpy2.0python3.12.____cpython.yaml → ...upport/osx_64_python3.12.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 hdf5:
 - 1.14.3
 json_c:

diff --git a/...osx_64_numpy2.0python3.9.____cpython.yaml → ...support/osx_64_python3.9.____cpython.yaml b/...osx_64_numpy2.0python3.9.____cpython.yaml → ...support/osx_64_python3.9.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 hdf5:
 - 1.14.3
 json_c: