diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml index 2e6006a40..576509125 100644 --- a/.github/workflows/build_workflow.yml +++ b/.github/workflows/build_workflow.yml @@ -25,7 +25,8 @@ jobs: shell: bash -l {0} strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + fail-fast: false steps: - id: skip_check uses: fkirc/skip-duplicate-actions@master @@ -57,7 +58,7 @@ jobs: channels: conda-forge channel-priority: strict auto-update-conda: true - python-version: ${{ matrix.python-version }} + python-version: 3.12 - if: ${{ steps.skip_check.outputs.should_skip != 'true' }} name: Finalize Build Environment @@ -68,8 +69,8 @@ jobs: - if: ${{ steps.skip_check.outputs.should_skip != 'true' }} name: Install mpas_tools run: | - conda create -y -n mpas_tools_dev --use-local mpas_tools \ - python=${{ matrix.python-version }} \ + conda create -y -n mpas_tools_dev -c ${CONDA_PREFIX}/conda-bld/ \ + -c conda-forge mpas_tools python=${{ matrix.python-version }} \ sphinx sphinx-multiversion mock sphinx_rtd_theme - if: ${{ steps.skip_check.outputs.should_skip != 'true' }} diff --git a/conda_package/ci/linux_64_python3.10.____cpython.yaml b/conda_package/ci/linux_64_python3.10.____cpython.yaml index d81f8ed23..7d3422283 100644 --- a/conda_package/ci/linux_64_python3.10.____cpython.yaml +++ b/conda_package/ci/linux_64_python3.10.____cpython.yaml @@ -1,25 +1,25 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- conda channel_sources: - conda-forge channel_targets: -- conda-forge mpas_tools_dev +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' hdf5: -- 1.14.3 +- 1.14.4 libnetcdf: - 4.9.2 netcdf_fortran: @@ -33,7 +33,5 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/conda_package/ci/linux_64_python3.11.____cpython.yaml b/conda_package/ci/linux_64_python3.11.____cpython.yaml index d66d9ebc2..e9a9811e1 100644 --- a/conda_package/ci/linux_64_python3.11.____cpython.yaml +++ b/conda_package/ci/linux_64_python3.11.____cpython.yaml @@ -1,25 +1,25 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- conda channel_sources: - conda-forge channel_targets: -- conda-forge mpas_tools_dev +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' hdf5: -- 1.14.3 +- 1.14.4 libnetcdf: - 4.9.2 netcdf_fortran: @@ -33,7 +33,5 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/conda_package/ci/linux_64_python3.12.____cpython.yaml b/conda_package/ci/linux_64_python3.12.____cpython.yaml index 7e8f45384..dd2339584 100644 --- a/conda_package/ci/linux_64_python3.12.____cpython.yaml +++ b/conda_package/ci/linux_64_python3.12.____cpython.yaml @@ -1,25 +1,25 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- conda channel_sources: - conda-forge channel_targets: -- conda-forge mpas_tools_dev +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' hdf5: -- 1.14.3 +- 1.14.4 libnetcdf: - 4.9.2 netcdf_fortran: @@ -33,7 +33,5 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/conda_package/ci/linux_64_python3.13.____cpython.yaml b/conda_package/ci/linux_64_python3.13.____cpython.yaml new file mode 100644 index 000000000..0e63a1fed --- /dev/null +++ b/conda_package/ci/linux_64_python3.13.____cpython.yaml @@ -0,0 +1,37 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '13' +hdf5: +- 1.14.4 +libnetcdf: +- 4.9.2 +netcdf_fortran: +- '4.6' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- linux-64 +zip_keys: +- - cxx_compiler_version + - fortran_compiler_version diff --git a/conda_package/ci/linux_64_python3.9.____cpython.yaml b/conda_package/ci/linux_64_python3.9.____cpython.yaml index c4c4c1fad..4e1d5c98a 100644 --- a/conda_package/ci/linux_64_python3.9.____cpython.yaml +++ b/conda_package/ci/linux_64_python3.9.____cpython.yaml @@ -1,25 +1,25 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- conda channel_sources: - conda-forge channel_targets: -- conda-forge mpas_tools_dev +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' hdf5: -- 1.14.3 +- 1.14.4 libnetcdf: - 4.9.2 netcdf_fortran: @@ -33,7 +33,5 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/conda_package/ci/osx_64_python3.10.____cpython.yaml b/conda_package/ci/osx_64_python3.10.____cpython.yaml index 6d8119571..034b64155 100644 --- a/conda_package/ci/osx_64_python3.10.____cpython.yaml +++ b/conda_package/ci/osx_64_python3.10.____cpython.yaml @@ -9,21 +9,21 @@ c_stdlib_version: channel_sources: - conda-forge channel_targets: -- conda-forge mpas_tools_dev +- conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' hdf5: -- 1.14.3 +- 1.14.4 libnetcdf: - 4.9.2 llvm_openmp: -- '16' +- '18' macos_machine: - x86_64-apple-darwin13.4.0 netcdf_fortran: diff --git a/conda_package/ci/osx_64_python3.11.____cpython.yaml b/conda_package/ci/osx_64_python3.11.____cpython.yaml index b64408dce..a8af6b0c8 100644 --- a/conda_package/ci/osx_64_python3.11.____cpython.yaml +++ b/conda_package/ci/osx_64_python3.11.____cpython.yaml @@ -9,21 +9,21 @@ c_stdlib_version: channel_sources: - conda-forge channel_targets: -- conda-forge mpas_tools_dev +- conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' hdf5: -- 1.14.3 +- 1.14.4 libnetcdf: - 4.9.2 llvm_openmp: -- '16' +- '18' macos_machine: - x86_64-apple-darwin13.4.0 netcdf_fortran: diff --git a/conda_package/ci/osx_64_python3.12.____cpython.yaml b/conda_package/ci/osx_64_python3.12.____cpython.yaml index 23c969739..0c9ec6cd6 100644 --- a/conda_package/ci/osx_64_python3.12.____cpython.yaml +++ b/conda_package/ci/osx_64_python3.12.____cpython.yaml @@ -9,21 +9,21 @@ c_stdlib_version: channel_sources: - conda-forge channel_targets: -- conda-forge mpas_tools_dev +- conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' hdf5: -- 1.14.3 +- 1.14.4 libnetcdf: - 4.9.2 llvm_openmp: -- '16' +- '18' macos_machine: - x86_64-apple-darwin13.4.0 netcdf_fortran: diff --git a/conda_package/ci/osx_64_python3.13.____cpython.yaml b/conda_package/ci/osx_64_python3.13.____cpython.yaml new file mode 100644 index 000000000..5f91480ea --- /dev/null +++ b/conda_package/ci/osx_64_python3.13.____cpython.yaml @@ -0,0 +1,41 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '13' +hdf5: +- 1.14.4 +libnetcdf: +- 4.9.2 +llvm_openmp: +- '18' +macos_machine: +- x86_64-apple-darwin13.4.0 +netcdf_fortran: +- '4.6' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- osx-64 +zip_keys: +- - cxx_compiler_version + - fortran_compiler_version diff --git a/conda_package/ci/osx_64_python3.9.____cpython.yaml b/conda_package/ci/osx_64_python3.9.____cpython.yaml index b3bbecf1d..22c972534 100644 --- a/conda_package/ci/osx_64_python3.9.____cpython.yaml +++ b/conda_package/ci/osx_64_python3.9.____cpython.yaml @@ -9,21 +9,21 @@ c_stdlib_version: channel_sources: - conda-forge channel_targets: -- conda-forge mpas_tools_dev +- conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' hdf5: -- 1.14.3 +- 1.14.4 libnetcdf: - 4.9.2 llvm_openmp: -- '16' +- '18' macos_machine: - x86_64-apple-darwin13.4.0 netcdf_fortran: diff --git a/conda_package/setup.py b/conda_package/setup.py index f148b1c36..3569f9949 100755 --- a/conda_package/setup.py +++ b/conda_package/setup.py @@ -59,6 +59,7 @@ 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13', 'Topic :: Scientific/Engineering', ], packages=find_packages(include=['mpas_tools', 'mpas_tools.*']),