From 71ed1748946934a8800c37b42de4ef243d15abc2 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 12:01:06 -0500 Subject: [PATCH 1/4] Remove setuptools, wheel deps for python>=3.13 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++++++-- .../linux_64_with_setuptools_wheelfalse.yaml | 10 ++++++++++ ...l => linux_64_with_setuptools_wheeltrue.yaml} | 2 ++ build-locally.py | 4 ++-- recipe/conda_build_config.yaml | 3 +++ recipe/meta.yaml | 16 +++++++++------- 6 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 .ci_support/linux_64_with_setuptools_wheelfalse.yaml rename .ci_support/{linux_64_.yaml => linux_64_with_setuptools_wheeltrue.yaml} (81%) create mode 100644 recipe/conda_build_config.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 875d996..f2fd523 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,8 +8,12 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_: - CONFIG: linux_64_ + linux_64_with_setuptools_wheelfalse: + CONFIG: linux_64_with_setuptools_wheelfalse + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_with_setuptools_wheeltrue: + CONFIG: linux_64_with_setuptools_wheeltrue UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.ci_support/linux_64_with_setuptools_wheelfalse.yaml b/.ci_support/linux_64_with_setuptools_wheelfalse.yaml new file mode 100644 index 0000000..ee44adf --- /dev/null +++ b/.ci_support/linux_64_with_setuptools_wheelfalse.yaml @@ -0,0 +1,10 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +with_setuptools_wheel: +- 'false' diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_with_setuptools_wheeltrue.yaml similarity index 81% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_with_setuptools_wheeltrue.yaml index 82f2873..5166be9 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_with_setuptools_wheeltrue.yaml @@ -6,3 +6,5 @@ channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +with_setuptools_wheel: +- 'true' diff --git a/build-locally.py b/build-locally.py index e0d408d..d78427b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..dbc17d2 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,3 @@ +with_setuptools_wheel: + - true + - false diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b9f1b9f..a59daaf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: build: noarch: python - number: 0 + number: 1 disable_pip: true entry_points: - pip = pip._internal.cli.main:main @@ -18,13 +18,15 @@ build: requirements: host: - - python >=3.8 - - setuptools - - wheel + - python >=3.13.a0 # [not with_setuptools_wheel] + - python >=3.8,<3.13.a0 # [with_setuptools_wheel] + - setuptools # [with_setuptools_wheel] + - wheel # [with_setuptools_wheel] run: - - python >=3.8 - - setuptools - - wheel + - python >=3.13.a0 # [not with_setuptools_wheel] + - python >=3.8,<3.13.a0 # [with_setuptools_wheel] + - setuptools # [with_setuptools_wheel] + - wheel # [with_setuptools_wheel] test: commands: From b094501f869e8586161b5eb34bdc6b3d8586689e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 12:23:59 -0500 Subject: [PATCH 2/4] 3.13 migration --- .../linux_64_with_setuptools_wheelfalse.yaml | 2 +- .../linux_64_with_setuptools_wheeltrue.yaml | 2 +- .ci_support/migrations/python313.yaml | 44 +++++++++++++++++++ 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 .ci_support/migrations/python313.yaml diff --git a/.ci_support/linux_64_with_setuptools_wheelfalse.yaml b/.ci_support/linux_64_with_setuptools_wheelfalse.yaml index ee44adf..e0105a4 100644 --- a/.ci_support/linux_64_with_setuptools_wheelfalse.yaml +++ b/.ci_support/linux_64_with_setuptools_wheelfalse.yaml @@ -1,7 +1,7 @@ cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: diff --git a/.ci_support/linux_64_with_setuptools_wheeltrue.yaml b/.ci_support/linux_64_with_setuptools_wheeltrue.yaml index 5166be9..550c5fd 100644 --- a/.ci_support/linux_64_with_setuptools_wheeltrue.yaml +++ b/.ci_support/linux_64_with_setuptools_wheeltrue.yaml @@ -1,7 +1,7 @@ cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/python_rc,conda-forge channel_targets: - conda-forge main docker_image: 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 From 5fda504dd686f5b893b9018c61d848a2c12976b8 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 16:48:38 -0500 Subject: [PATCH 3/4] Update meta.yaml --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a59daaf..f455a51 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,8 +20,8 @@ requirements: host: - python >=3.13.a0 # [not with_setuptools_wheel] - python >=3.8,<3.13.a0 # [with_setuptools_wheel] - - setuptools # [with_setuptools_wheel] - - wheel # [with_setuptools_wheel] + - setuptools + - wheel run: - python >=3.13.a0 # [not with_setuptools_wheel] - python >=3.8,<3.13.a0 # [with_setuptools_wheel] From b86ccae466d556c87142831166b97757dadabc03 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 29 Aug 2024 09:22:53 -0500 Subject: [PATCH 4/4] Fix versions --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f455a51..d730cd3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,15 +18,15 @@ build: requirements: host: - - python >=3.13.a0 # [not with_setuptools_wheel] - - python >=3.8,<3.13.a0 # [with_setuptools_wheel] + - python >=3.13.0a0 # [not with_setuptools_wheel] + - python >=3.8,<3.13.0a0 # [with_setuptools_wheel] - setuptools - wheel run: - - python >=3.13.a0 # [not with_setuptools_wheel] - - python >=3.8,<3.13.a0 # [with_setuptools_wheel] - - setuptools # [with_setuptools_wheel] - - wheel # [with_setuptools_wheel] + - python >=3.13.0a0 # [not with_setuptools_wheel] + - python >=3.8,<3.13.0a0 # [with_setuptools_wheel] + - setuptools # [with_setuptools_wheel] + - wheel # [with_setuptools_wheel] test: commands: