From 5a85d54be318f370b8a3a008a998ae970b666d77 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 10:27:08 -0500 Subject: [PATCH 1/2] Add python 3.13 migrations --- recipe/conda_build_config.yaml | 2 ++ recipe/migrations/python313.yaml | 44 ++++++++++++++++++++++++++++ recipe/migrations/python313t.yaml | 48 +++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 recipe/migrations/python313.yaml create mode 100644 recipe/migrations/python313t.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index b0c3abdcd9..5fe9451814 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -772,6 +772,8 @@ python_impl: - cpython - cpython - cpython +is_freethreading: + - false # Keep in sync with libtorch pytorch: - '2.3' diff --git a/recipe/migrations/python313.yaml b/recipe/migrations/python313.yaml new file mode 100644 index 0000000000..0b803d1500 --- /dev/null +++ b/recipe/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/recipe/migrations/python313t.yaml b/recipe/migrations/python313t.yaml new file mode 100644 index 0000000000..d14ef27113 --- /dev/null +++ b/recipe/migrations/python313t.yaml @@ -0,0 +1,48 @@ +migrator_ts: 1724712608 +__migrator: + commit_message: Rebuild for python 3.13 freethreading + 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.13.* *_cp313t # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: true + 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 + - is_freethreading + +python: + - 3.13.* *_cp313t +channel_sources: + - conda-forge/label/python_rc,conda-forge +# additional entries to add for zip_keys +numpy: + - 2 +python_impl: + - cpython +is_freethreading: + - true From f46e6c854cd2d3de49cffce40d6cedc7c0482bb6 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 10:37:09 -0500 Subject: [PATCH 2/2] fix lint --- recipe/migrations/python313.yaml | 22 +++++++++++----------- recipe/migrations/python313t.yaml | 26 +++++++++++++------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/recipe/migrations/python313.yaml b/recipe/migrations/python313.yaml index 0b803d1500..92cc90b0f1 100644 --- a/recipe/migrations/python313.yaml +++ b/recipe/migrations/python313.yaml @@ -23,22 +23,22 @@ __migrator: 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 + # 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 + - channel_sources python: - - 3.13.* *_cp313 +- 3.13.* *_cp313 channel_sources: - - conda-forge/label/python_rc,conda-forge +- conda-forge/label/python_rc,conda-forge # additional entries to add for zip_keys numpy: - - 2 +- 2 python_impl: - - cpython +- cpython diff --git a/recipe/migrations/python313t.yaml b/recipe/migrations/python313t.yaml index d14ef27113..c1104ff0d2 100644 --- a/recipe/migrations/python313t.yaml +++ b/recipe/migrations/python313t.yaml @@ -24,25 +24,25 @@ __migrator: 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 + # 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 - - is_freethreading + - channel_sources + - is_freethreading python: - - 3.13.* *_cp313t +- 3.13.* *_cp313t channel_sources: - - conda-forge/label/python_rc,conda-forge +- conda-forge/label/python_rc,conda-forge # additional entries to add for zip_keys numpy: - - 2 +- 2 python_impl: - - cpython +- cpython is_freethreading: - - true +- true