diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 68b02e4..2f2bb81 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -20,8 +20,8 @@ jobs: CONFIG: linux_64_mpimpichpython3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mpimpichpython3.8.____cpython: - CONFIG: linux_64_mpimpichpython3.8.____cpython + linux_64_mpimpichpython3.13.____cp313: + CONFIG: linux_64_mpimpichpython3.13.____cp313 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_mpimpichpython3.9.____cpython: @@ -40,8 +40,8 @@ jobs: CONFIG: linux_64_mpiopenmpipython3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mpiopenmpipython3.8.____cpython: - CONFIG: linux_64_mpiopenmpipython3.8.____cpython + linux_64_mpiopenmpipython3.13.____cp313: + CONFIG: linux_64_mpiopenmpipython3.13.____cp313 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_mpiopenmpipython3.9.____cpython: @@ -60,8 +60,8 @@ jobs: CONFIG: linux_aarch64_mpimpichpython3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpimpichpython3.8.____cpython: - CONFIG: linux_aarch64_mpimpichpython3.8.____cpython + linux_aarch64_mpimpichpython3.13.____cp313: + CONFIG: linux_aarch64_mpimpichpython3.13.____cp313 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_mpimpichpython3.9.____cpython: @@ -80,8 +80,8 @@ jobs: CONFIG: linux_aarch64_mpiopenmpipython3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpiopenmpipython3.8.____cpython: - CONFIG: linux_aarch64_mpiopenmpipython3.8.____cpython + linux_aarch64_mpiopenmpipython3.13.____cp313: + CONFIG: linux_aarch64_mpiopenmpipython3.13.____cp313 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_mpiopenmpipython3.9.____cpython: diff --git a/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml index ce3812b..227b510 100644 --- a/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -47,3 +47,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_64_mpimpichpython3.11.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.11.____cpython.yaml index e3583b2..3f4c65d 100644 --- a/.ci_support/linux_64_mpimpichpython3.11.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -47,3 +47,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_64_mpimpichpython3.12.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.12.____cpython.yaml index ca0f55b..bf54d8d 100644 --- a/.ci_support/linux_64_mpimpichpython3.12.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -47,3 +47,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_64_mpimpichpython3.8.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.13.____cp313.yaml similarity index 84% rename from .ci_support/linux_64_mpimpichpython3.8.____cpython.yaml rename to .ci_support/linux_64_mpimpichpython3.13.____cp313.yaml index 1f88256..67239ca 100644 --- a/.ci_support/linux_64_mpimpichpython3.8.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.13.____cp313.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: @@ -37,7 +37,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 sqlite: - '3' target_platform: @@ -47,3 +47,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml index 9c18270..19b4678 100644 --- a/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -47,3 +47,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml index dc71e9d..3a129fd 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -47,3 +47,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_64_mpiopenmpipython3.11.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.11.____cpython.yaml index 5011fb9..7d3b669 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.11.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -47,3 +47,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_64_mpiopenmpipython3.12.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.12.____cpython.yaml index a0926bd..16491b4 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.12.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -47,3 +47,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_64_mpiopenmpipython3.8.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.13.____cp313.yaml similarity index 84% rename from .ci_support/linux_64_mpiopenmpipython3.8.____cpython.yaml rename to .ci_support/linux_64_mpiopenmpipython3.13.____cp313.yaml index 1249a29..bdff7c9 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.8.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.13.____cp313.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: @@ -37,7 +37,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 sqlite: - '3' target_platform: @@ -47,3 +47,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml index e86b92d..24eca25 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -47,3 +47,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_mpimpichpython3.10.____cpython.yaml b/.ci_support/linux_aarch64_mpimpichpython3.10.____cpython.yaml index 62d1ee9..1710d4f 100644 --- a/.ci_support/linux_aarch64_mpimpichpython3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichpython3.10.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -51,3 +51,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_mpimpichpython3.11.____cpython.yaml b/.ci_support/linux_aarch64_mpimpichpython3.11.____cpython.yaml index c54909e..cb8d1c1 100644 --- a/.ci_support/linux_aarch64_mpimpichpython3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichpython3.11.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -51,3 +51,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_mpimpichpython3.12.____cpython.yaml b/.ci_support/linux_aarch64_mpimpichpython3.12.____cpython.yaml index 7489803..48d7c69 100644 --- a/.ci_support/linux_aarch64_mpimpichpython3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichpython3.12.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -51,3 +51,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_mpimpichpython3.8.____cpython.yaml b/.ci_support/linux_aarch64_mpimpichpython3.13.____cp313.yaml similarity index 85% rename from .ci_support/linux_aarch64_mpimpichpython3.8.____cpython.yaml rename to .ci_support/linux_aarch64_mpimpichpython3.13.____cp313.yaml index 2c7311f..6313431 100644 --- a/.ci_support/linux_aarch64_mpimpichpython3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichpython3.13.____cp313.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: @@ -41,7 +41,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 sqlite: - '3' target_platform: @@ -51,3 +51,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_mpimpichpython3.9.____cpython.yaml b/.ci_support/linux_aarch64_mpimpichpython3.9.____cpython.yaml index 19cace1..0e06146 100644 --- a/.ci_support/linux_aarch64_mpimpichpython3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichpython3.9.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -51,3 +51,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_mpiopenmpipython3.10.____cpython.yaml b/.ci_support/linux_aarch64_mpiopenmpipython3.10.____cpython.yaml index 6a46ec7..8d6626b 100644 --- a/.ci_support/linux_aarch64_mpiopenmpipython3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpipython3.10.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -51,3 +51,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_mpiopenmpipython3.11.____cpython.yaml b/.ci_support/linux_aarch64_mpiopenmpipython3.11.____cpython.yaml index e4f7cc5..60d2e52 100644 --- a/.ci_support/linux_aarch64_mpiopenmpipython3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpipython3.11.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -51,3 +51,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_mpiopenmpipython3.12.____cpython.yaml b/.ci_support/linux_aarch64_mpiopenmpipython3.12.____cpython.yaml index af47f2d..670ab4e 100644 --- a/.ci_support/linux_aarch64_mpiopenmpipython3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpipython3.12.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -51,3 +51,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_mpiopenmpipython3.8.____cpython.yaml b/.ci_support/linux_aarch64_mpiopenmpipython3.13.____cp313.yaml similarity index 85% rename from .ci_support/linux_aarch64_mpiopenmpipython3.8.____cpython.yaml rename to .ci_support/linux_aarch64_mpiopenmpipython3.13.____cp313.yaml index be40c6d..1281380 100644 --- a/.ci_support/linux_aarch64_mpiopenmpipython3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpipython3.13.____cp313.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: @@ -41,7 +41,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.13.* *_cp313 sqlite: - '3' target_platform: @@ -51,3 +51,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_mpiopenmpipython3.9.____cpython.yaml b/.ci_support/linux_aarch64_mpiopenmpipython3.9.____cpython.yaml index 19dd362..4466b06 100644 --- a/.ci_support/linux_aarch64_mpiopenmpipython3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpipython3.9.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -51,3 +51,5 @@ zeromq: zip_keys: - - c_stdlib_version - cdt_name +- - python + - channel_sources diff --git a/.ci_support/migrations/libhwloc2110.yaml b/.ci_support/migrations/libhwloc2110.yaml deleted file mode 100644 index f82784e..0000000 --- a/.ci_support/migrations/libhwloc2110.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libhwloc 2.11.0 - kind: version - migration_number: 1 -libhwloc: -- 2.11.0 -migrator_ts: 1719349281.82988 diff --git a/.ci_support/migrations/libhwloc2111.yaml b/.ci_support/migrations/libhwloc2111.yaml deleted file mode 100644 index ca90c7a..0000000 --- a/.ci_support/migrations/libhwloc2111.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libhwloc 2.11.1 - kind: version - migration_number: 1 -libhwloc: -- 2.11.1 -migrator_ts: 1720471981.8039248 diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python313.yaml new file mode 100644 index 0000000..92cc90b --- /dev/null +++ b/.ci_support/migrations/python313.yaml @@ -0,0 +1,44 @@ +migrator_ts: 1724712607 +__migrator: + commit_message: Rebuild for python 3.13 + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython + - 3.13.* *_cp313 # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: true + pr_limit: 20 + max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + additional_zip_keys: + - channel_sources + +python: +- 3.13.* *_cp313 +channel_sources: +- conda-forge/label/python_rc,conda-forge +# additional entries to add for zip_keys +numpy: +- 2 +python_impl: +- cpython diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a5836e8..ba4b251 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,7 +72,6 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" - ( startgroup "Inspecting artifacts" ) 2> /dev/null # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 diff --git a/README.md b/README.md index ac6aad1..6dd3c1e 100644 --- a/README.md +++ b/README.md @@ -58,10 +58,10 @@ Current build status - linux_64_mpimpichpython3.8.____cpython + linux_64_mpimpichpython3.13.____cp313 - variant + variant @@ -93,10 +93,10 @@ Current build status - linux_64_mpiopenmpipython3.8.____cpython + linux_64_mpiopenmpipython3.13.____cp313 - variant + variant @@ -128,10 +128,10 @@ Current build status - linux_aarch64_mpimpichpython3.8.____cpython + linux_aarch64_mpimpichpython3.13.____cp313 - variant + variant @@ -163,10 +163,10 @@ Current build status - linux_aarch64_mpiopenmpipython3.8.____cpython + linux_aarch64_mpiopenmpipython3.13.____cp313 - variant + variant diff --git a/build-locally.py b/build-locally.py index e0d408d..8ac9b84 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,16 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 12c999c..d579749 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - centos6.patch # This patch can be removed once the conda-forge reference is updated build: - number: 0 + number: 1 skip: true # [not linux] run_exports: - {{ pin_subpackage('flux-core', max_pin='x.x') }}