diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 9e101db..412d865 100644 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,8 +8,8 @@ jobs: vmImage: $(VMIMAGE) strategy: matrix: - osx_64_python3.10.____cpython: - CONFIG: osx_64_python3.10.____cpython + osx_64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315: + CONFIG: osx_64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315 UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15 build_workspace_dir: ~/miniforge3/conda-bld @@ -18,8 +18,8 @@ jobs: resize_partitions: false store_build_artifacts: false tools_install_dir: ~/miniforge3 - osx_64_python3.11.____cpython: - CONFIG: osx_64_python3.11.____cpython + osx_64_channel_sourcesconda-forgepython3.11.____cpython: + CONFIG: osx_64_channel_sourcesconda-forgepython3.11.____cpython UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15 build_workspace_dir: ~/miniforge3/conda-bld @@ -28,8 +28,8 @@ jobs: resize_partitions: false store_build_artifacts: false tools_install_dir: ~/miniforge3 - osx_64_python3.12.____cpython: - CONFIG: osx_64_python3.12.____cpython + osx_64_channel_sourcesconda-forgepython3.12.____cpython: + CONFIG: osx_64_channel_sourcesconda-forgepython3.12.____cpython UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15 build_workspace_dir: ~/miniforge3/conda-bld @@ -38,8 +38,8 @@ jobs: resize_partitions: false store_build_artifacts: false tools_install_dir: ~/miniforge3 - osx_64_python3.13.____cp313: - CONFIG: osx_64_python3.13.____cp313 + osx_64_channel_sourcesconda-forgepython3.13.____cp313: + CONFIG: osx_64_channel_sourcesconda-forgepython3.13.____cp313 UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15 build_workspace_dir: ~/miniforge3/conda-bld @@ -48,8 +48,8 @@ jobs: resize_partitions: false store_build_artifacts: false tools_install_dir: ~/miniforge3 - osx_64_python3.14.____cp314: - CONFIG: osx_64_python3.14.____cp314 + osx_64_channel_sourcesconda-forgepython3.14.____cp314: + CONFIG: osx_64_channel_sourcesconda-forgepython3.14.____cp314 UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15 build_workspace_dir: ~/miniforge3/conda-bld @@ -58,8 +58,8 @@ jobs: resize_partitions: false store_build_artifacts: false tools_install_dir: ~/miniforge3 - osx_arm64_python3.10.____cpython: - CONFIG: osx_arm64_python3.10.____cpython + osx_arm64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315: + CONFIG: osx_arm64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315 UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15-arm64 build_workspace_dir: ~/miniforge3/conda-bld @@ -68,8 +68,8 @@ jobs: resize_partitions: false store_build_artifacts: false tools_install_dir: ~/miniforge3 - osx_arm64_python3.11.____cpython: - CONFIG: osx_arm64_python3.11.____cpython + osx_arm64_channel_sourcesconda-forgepython3.11.____cpython: + CONFIG: osx_arm64_channel_sourcesconda-forgepython3.11.____cpython UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15-arm64 build_workspace_dir: ~/miniforge3/conda-bld @@ -78,8 +78,8 @@ jobs: resize_partitions: false store_build_artifacts: false tools_install_dir: ~/miniforge3 - osx_arm64_python3.12.____cpython: - CONFIG: osx_arm64_python3.12.____cpython + osx_arm64_channel_sourcesconda-forgepython3.12.____cpython: + CONFIG: osx_arm64_channel_sourcesconda-forgepython3.12.____cpython UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15-arm64 build_workspace_dir: ~/miniforge3/conda-bld @@ -88,8 +88,8 @@ jobs: resize_partitions: false store_build_artifacts: false tools_install_dir: ~/miniforge3 - osx_arm64_python3.13.____cp313: - CONFIG: osx_arm64_python3.13.____cp313 + osx_arm64_channel_sourcesconda-forgepython3.13.____cp313: + CONFIG: osx_arm64_channel_sourcesconda-forgepython3.13.____cp313 UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15-arm64 build_workspace_dir: ~/miniforge3/conda-bld @@ -98,8 +98,8 @@ jobs: resize_partitions: false store_build_artifacts: false tools_install_dir: ~/miniforge3 - osx_arm64_python3.14.____cp314: - CONFIG: osx_arm64_python3.14.____cp314 + osx_arm64_channel_sourcesconda-forgepython3.14.____cp314: + CONFIG: osx_arm64_channel_sourcesconda-forgepython3.14.____cp314 UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15-arm64 build_workspace_dir: ~/miniforge3/conda-bld diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml similarity index 75% rename from .ci_support/linux_64_python3.10.____cpython.yaml rename to .ci_support/linux_64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml index ca6488f..f3bfe07 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml @@ -1,13 +1,13 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: - '2.17' channel_sources: -- conda-forge +- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main dbus: @@ -21,6 +21,9 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.10.* *_cpython +- 3.15.* *_cp315 target_platform: - linux-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_channel_sourcesconda-forgepython3.11.____cpython.yaml similarity index 88% rename from .ci_support/linux_64_python3.11.____cpython.yaml rename to .ci_support/linux_64_channel_sourcesconda-forgepython3.11.____cpython.yaml index 8dcda40..fab61cd 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_channel_sourcesconda-forgepython3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -24,3 +24,6 @@ python: - 3.11.* *_cpython target_platform: - linux-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_channel_sourcesconda-forgepython3.12.____cpython.yaml similarity index 88% rename from .ci_support/linux_64_python3.12.____cpython.yaml rename to .ci_support/linux_64_channel_sourcesconda-forgepython3.12.____cpython.yaml index 8a21b02..4fd7495 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_channel_sourcesconda-forgepython3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -24,3 +24,6 @@ python: - 3.12.* *_cpython target_platform: - linux-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_64_python3.13.____cp313.yaml b/.ci_support/linux_64_channel_sourcesconda-forgepython3.13.____cp313.yaml similarity index 88% rename from .ci_support/linux_64_python3.13.____cp313.yaml rename to .ci_support/linux_64_channel_sourcesconda-forgepython3.13.____cp313.yaml index c85fdfa..7065fc7 100644 --- a/.ci_support/linux_64_python3.13.____cp313.yaml +++ b/.ci_support/linux_64_channel_sourcesconda-forgepython3.13.____cp313.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -24,3 +24,6 @@ python: - 3.13.* *_cp313 target_platform: - linux-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_64_python3.14.____cp314.yaml b/.ci_support/linux_64_channel_sourcesconda-forgepython3.14.____cp314.yaml similarity index 88% rename from .ci_support/linux_64_python3.14.____cp314.yaml rename to .ci_support/linux_64_channel_sourcesconda-forgepython3.14.____cp314.yaml index f57efa2..29893f5 100644 --- a/.ci_support/linux_64_python3.14.____cp314.yaml +++ b/.ci_support/linux_64_channel_sourcesconda-forgepython3.14.____cp314.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -24,3 +24,6 @@ python: - 3.14.* *_cp314 target_platform: - linux-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml similarity index 75% rename from .ci_support/linux_aarch64_python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml index 9a35fe1..6d989b7 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml @@ -1,13 +1,13 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: - '2.17' channel_sources: -- conda-forge +- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main dbus: @@ -21,6 +21,9 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.10.* *_cpython +- 3.15.* *_cp315 target_platform: - linux-aarch64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_channel_sourcesconda-forgepython3.11.____cpython.yaml similarity index 88% rename from .ci_support/linux_aarch64_python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_channel_sourcesconda-forgepython3.11.____cpython.yaml index 3175563..56d6631 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_channel_sourcesconda-forgepython3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -24,3 +24,6 @@ python: - 3.11.* *_cpython target_platform: - linux-aarch64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_channel_sourcesconda-forgepython3.12.____cpython.yaml similarity index 88% rename from .ci_support/linux_aarch64_python3.12.____cpython.yaml rename to .ci_support/linux_aarch64_channel_sourcesconda-forgepython3.12.____cpython.yaml index f85c30f..09cf241 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_channel_sourcesconda-forgepython3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -24,3 +24,6 @@ python: - 3.12.* *_cpython target_platform: - linux-aarch64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.13.____cp313.yaml b/.ci_support/linux_aarch64_channel_sourcesconda-forgepython3.13.____cp313.yaml similarity index 88% rename from .ci_support/linux_aarch64_python3.13.____cp313.yaml rename to .ci_support/linux_aarch64_channel_sourcesconda-forgepython3.13.____cp313.yaml index 34e8543..2ffab77 100644 --- a/.ci_support/linux_aarch64_python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_channel_sourcesconda-forgepython3.13.____cp313.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -24,3 +24,6 @@ python: - 3.13.* *_cp313 target_platform: - linux-aarch64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_aarch64_python3.14.____cp314.yaml b/.ci_support/linux_aarch64_channel_sourcesconda-forgepython3.14.____cp314.yaml similarity index 88% rename from .ci_support/linux_aarch64_python3.14.____cp314.yaml rename to .ci_support/linux_aarch64_channel_sourcesconda-forgepython3.14.____cp314.yaml index cce1cd7..564fbed 100644 --- a/.ci_support/linux_aarch64_python3.14.____cp314.yaml +++ b/.ci_support/linux_aarch64_channel_sourcesconda-forgepython3.14.____cp314.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -24,3 +24,6 @@ python: - 3.14.* *_cp314 target_platform: - linux-aarch64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml similarity index 75% rename from .ci_support/linux_ppc64le_python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml index 0fd0524..ba6d449 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml @@ -1,13 +1,13 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: - '2.17' channel_sources: -- conda-forge +- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main dbus: @@ -21,6 +21,9 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.10.* *_cpython +- 3.15.* *_cp315 target_platform: - linux-ppc64le +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_channel_sourcesconda-forgepython3.11.____cpython.yaml similarity index 88% rename from .ci_support/linux_ppc64le_python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_channel_sourcesconda-forgepython3.11.____cpython.yaml index 87c7b1b..23c8bac 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_channel_sourcesconda-forgepython3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -24,3 +24,6 @@ python: - 3.11.* *_cpython target_platform: - linux-ppc64le +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_channel_sourcesconda-forgepython3.12.____cpython.yaml similarity index 88% rename from .ci_support/linux_ppc64le_python3.12.____cpython.yaml rename to .ci_support/linux_ppc64le_channel_sourcesconda-forgepython3.12.____cpython.yaml index e6e4f7f..a4b020c 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_channel_sourcesconda-forgepython3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -24,3 +24,6 @@ python: - 3.12.* *_cpython target_platform: - linux-ppc64le +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_channel_sourcesconda-forgepython3.13.____cp313.yaml similarity index 88% rename from .ci_support/linux_ppc64le_python3.13.____cp313.yaml rename to .ci_support/linux_ppc64le_channel_sourcesconda-forgepython3.13.____cp313.yaml index 16799f4..cb74a3f 100644 --- a/.ci_support/linux_ppc64le_python3.13.____cp313.yaml +++ b/.ci_support/linux_ppc64le_channel_sourcesconda-forgepython3.13.____cp313.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -24,3 +24,6 @@ python: - 3.13.* *_cp313 target_platform: - linux-ppc64le +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.14.____cp314.yaml b/.ci_support/linux_ppc64le_channel_sourcesconda-forgepython3.14.____cp314.yaml similarity index 88% rename from .ci_support/linux_ppc64le_python3.14.____cp314.yaml rename to .ci_support/linux_ppc64le_channel_sourcesconda-forgepython3.14.____cp314.yaml index 8a1b760..f7c6652 100644 --- a/.ci_support/linux_ppc64le_python3.14.____cp314.yaml +++ b/.ci_support/linux_ppc64le_channel_sourcesconda-forgepython3.14.____cp314.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -24,3 +24,6 @@ python: - 3.14.* *_cp314 target_platform: - linux-ppc64le +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python313.yaml deleted file mode 100644 index 92cc90b..0000000 --- a/.ci_support/migrations/python313.yaml +++ /dev/null @@ -1,44 +0,0 @@ -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/.ci_support/migrations/python314.yaml b/.ci_support/migrations/python315.yaml similarity index 79% rename from .ci_support/migrations/python314.yaml rename to .ci_support/migrations/python315.yaml index 6be72b1..3394fde 100644 --- a/.ci_support/migrations/python314.yaml +++ b/.ci_support/migrations/python315.yaml @@ -1,9 +1,9 @@ -# this is intentionally sorted before the 3.13t migrator, because that determines +# this is intentionally sorted before the 3.14t migrator, because that determines # the order of application of the migrators; otherwise we'd have to add values for -# is_freethreading and is_abi3 keys here, since that migration extends the zip -migrator_ts: 1724712607 +# is_freethreading and is_abi3 keys here, since that migration extends the zip; +migrator_ts: 1755739490 __migrator: - commit_message: Rebuild for python 3.14 + commit_message: Rebuild for python 3.15 migration_number: 1 operation: key_add primary_key: python @@ -15,7 +15,9 @@ __migrator: - 3.12.* *_cpython - 3.13.* *_cp313 - 3.13.* *_cp313t - - 3.14.* *_cp314 # new entry + - 3.14.* *_cp314 + - 3.14.* *_cp314t + - 3.15.* *_cp315 # new entry paused: false longterm: true pr_limit: 5 @@ -35,7 +37,7 @@ __migrator: - channel_sources python: -- 3.14.* *_cp314 +- 3.15.* *_cp315 # additional entries to add for zip_keys is_python_min: - false diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml similarity index 78% rename from .ci_support/osx_64_python3.10.____cpython.yaml rename to .ci_support/osx_64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml index e363f9a..4282fe0 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml @@ -5,13 +5,13 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge +- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main dbus: @@ -25,6 +25,9 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.10.* *_cpython +- 3.15.* *_cp315 target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_channel_sourcesconda-forgepython3.11.____cpython.yaml similarity index 89% rename from .ci_support/osx_64_python3.11.____cpython.yaml rename to .ci_support/osx_64_channel_sourcesconda-forgepython3.11.____cpython.yaml index e9044f3..c955446 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_channel_sourcesconda-forgepython3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -28,3 +28,6 @@ python: - 3.11.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_channel_sourcesconda-forgepython3.12.____cpython.yaml similarity index 89% rename from .ci_support/osx_64_python3.12.____cpython.yaml rename to .ci_support/osx_64_channel_sourcesconda-forgepython3.12.____cpython.yaml index 610c2ca..0348d43 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_channel_sourcesconda-forgepython3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -28,3 +28,6 @@ python: - 3.12.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.13.____cp313.yaml b/.ci_support/osx_64_channel_sourcesconda-forgepython3.13.____cp313.yaml similarity index 89% rename from .ci_support/osx_64_python3.13.____cp313.yaml rename to .ci_support/osx_64_channel_sourcesconda-forgepython3.13.____cp313.yaml index d4cbe91..7d4660b 100644 --- a/.ci_support/osx_64_python3.13.____cp313.yaml +++ b/.ci_support/osx_64_channel_sourcesconda-forgepython3.13.____cp313.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -28,3 +28,6 @@ python: - 3.13.* *_cp313 target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_64_python3.14.____cp314.yaml b/.ci_support/osx_64_channel_sourcesconda-forgepython3.14.____cp314.yaml similarity index 89% rename from .ci_support/osx_64_python3.14.____cp314.yaml rename to .ci_support/osx_64_channel_sourcesconda-forgepython3.14.____cp314.yaml index c026204..18f8d54 100644 --- a/.ci_support/osx_64_python3.14.____cp314.yaml +++ b/.ci_support/osx_64_channel_sourcesconda-forgepython3.14.____cp314.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -28,3 +28,6 @@ python: - 3.14.* *_cp314 target_platform: - osx-64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml similarity index 78% rename from .ci_support/osx_arm64_python3.10.____cpython.yaml rename to .ci_support/osx_arm64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml index 0add693..98667e0 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315.yaml @@ -5,13 +5,13 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge +- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main dbus: @@ -25,6 +25,9 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.10.* *_cpython +- 3.15.* *_cp315 target_platform: - osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_channel_sourcesconda-forgepython3.11.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_python3.11.____cpython.yaml rename to .ci_support/osx_arm64_channel_sourcesconda-forgepython3.11.____cpython.yaml index e3bf8dd..82d1e08 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_channel_sourcesconda-forgepython3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -28,3 +28,6 @@ python: - 3.11.* *_cpython target_platform: - osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_channel_sourcesconda-forgepython3.12.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_python3.12.____cpython.yaml rename to .ci_support/osx_arm64_channel_sourcesconda-forgepython3.12.____cpython.yaml index dca023f..e8c1853 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_channel_sourcesconda-forgepython3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -28,3 +28,6 @@ python: - 3.12.* *_cpython target_platform: - osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.13.____cp313.yaml b/.ci_support/osx_arm64_channel_sourcesconda-forgepython3.13.____cp313.yaml similarity index 89% rename from .ci_support/osx_arm64_python3.13.____cp313.yaml rename to .ci_support/osx_arm64_channel_sourcesconda-forgepython3.13.____cp313.yaml index a68392b..8cc740f 100644 --- a/.ci_support/osx_arm64_python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_channel_sourcesconda-forgepython3.13.____cp313.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -28,3 +28,6 @@ python: - 3.13.* *_cp313 target_platform: - osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.ci_support/osx_arm64_python3.14.____cp314.yaml b/.ci_support/osx_arm64_channel_sourcesconda-forgepython3.14.____cp314.yaml similarity index 89% rename from .ci_support/osx_arm64_python3.14.____cp314.yaml rename to .ci_support/osx_arm64_channel_sourcesconda-forgepython3.14.____cp314.yaml index 7825ebf..63246e1 100644 --- a/.ci_support/osx_arm64_python3.14.____cp314.yaml +++ b/.ci_support/osx_arm64_channel_sourcesconda-forgepython3.14.____cp314.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -28,3 +28,6 @@ python: - 3.14.* *_cp314 target_platform: - osx-arm64 +zip_keys: +- - python + - channel_sources diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index e472b90..7491d20 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -22,7 +22,7 @@ jobs: max-parallel: 50 matrix: include: - - CONFIG: linux_64_python3.10.____cpython + - CONFIG: linux_64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315 DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -34,7 +34,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-latest'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_64_python3.11.____cpython + - CONFIG: linux_64_channel_sourcesconda-forgepython3.11.____cpython DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -46,7 +46,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-latest'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_64_python3.12.____cpython + - CONFIG: linux_64_channel_sourcesconda-forgepython3.12.____cpython DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -58,7 +58,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-latest'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_64_python3.13.____cp313 + - CONFIG: linux_64_channel_sourcesconda-forgepython3.13.____cp313 DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -70,7 +70,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-latest'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_64_python3.14.____cp314 + - CONFIG: linux_64_channel_sourcesconda-forgepython3.14.____cp314 DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -82,7 +82,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-latest'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_aarch64_python3.10.____cpython + - CONFIG: linux_aarch64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315 DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -94,7 +94,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-24.04-arm'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_aarch64_python3.11.____cpython + - CONFIG: linux_aarch64_channel_sourcesconda-forgepython3.11.____cpython DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -106,7 +106,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-24.04-arm'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_aarch64_python3.12.____cpython + - CONFIG: linux_aarch64_channel_sourcesconda-forgepython3.12.____cpython DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -118,7 +118,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-24.04-arm'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_aarch64_python3.13.____cp313 + - CONFIG: linux_aarch64_channel_sourcesconda-forgepython3.13.____cp313 DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -130,7 +130,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-24.04-arm'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_aarch64_python3.14.____cp314 + - CONFIG: linux_aarch64_channel_sourcesconda-forgepython3.14.____cp314 DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -142,7 +142,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-24.04-arm'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_ppc64le_python3.10.____cpython + - CONFIG: linux_ppc64le_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315 DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -154,7 +154,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-latest'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_ppc64le_python3.11.____cpython + - CONFIG: linux_ppc64le_channel_sourcesconda-forgepython3.11.____cpython DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -166,7 +166,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-latest'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_ppc64le_python3.12.____cpython + - CONFIG: linux_ppc64le_channel_sourcesconda-forgepython3.12.____cpython DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -178,7 +178,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-latest'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_ppc64le_python3.13.____cp313 + - CONFIG: linux_ppc64le_channel_sourcesconda-forgepython3.13.____cp313 DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True @@ -190,7 +190,7 @@ jobs: resize_partitions: False runs_on: ['ubuntu-latest'] tools_install_dir: ~/miniforge3 - - CONFIG: linux_ppc64le_python3.14.____cp314 + - CONFIG: linux_ppc64le_channel_sourcesconda-forgepython3.14.____cp314 DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10 STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True diff --git a/README.md b/README.md index f2afaa3..d4263f6 100644 --- a/README.md +++ b/README.md @@ -46,73 +46,73 @@ Current build status - + - + - + - + - + - + - + - + - + - + @@ -288,6 +288,5 @@ In order to produce a uniquely identifiable distribution: Feedstock Maintainers ===================== -* [@duncanmmacleod](https://github.com/duncanmmacleod/) * [@mgorny](https://github.com/mgorny/) diff --git a/recipe/patches/Revert-using-Py_TPFLAGS_MANAGED_WEAKREF.patch b/recipe/patches/Revert-using-Py_TPFLAGS_MANAGED_WEAKREF.patch new file mode 100644 index 0000000..0c039fa --- /dev/null +++ b/recipe/patches/Revert-using-Py_TPFLAGS_MANAGED_WEAKREF.patch @@ -0,0 +1,130 @@ +From 32191526f73fa4ac6f760848c354b1353920755e Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Wed, 14 Jan 2026 21:45:55 +0100 +Subject: [PATCH] Revert using Py_TPFLAGS_MANAGED_WEAKREF + +Added in https://gitlab.freedesktop.org/dbus/dbus-python/-/merge_requests/35 +The feature is incomplete and doesn't work. +--- + dbus_bindings/conn-internal.h | 2 -- + dbus_bindings/conn.c | 11 ----------- + dbus_bindings/server.c | 13 ------------- + 3 files changed, 26 deletions(-) + +diff --git a/dbus_bindings/conn-internal.h b/dbus_bindings/conn-internal.h +index ae47816..d333d27 100644 +--- a/dbus_bindings/conn-internal.h ++++ b/dbus_bindings/conn-internal.h +@@ -42,10 +42,8 @@ typedef struct { + */ + PyObject *object_paths; + +-#if !DBUSPY_PY_VERSION_AT_LEAST(3, 12, 0, 0) + /* Weak-references list to make Connections weakly referenceable */ + PyObject *weaklist; +-#endif + + dbus_bool_t has_mainloop; + } Connection; +diff --git a/dbus_bindings/conn.c b/dbus_bindings/conn.c +index 54efc49..5dd4b5e 100644 +--- a/dbus_bindings/conn.c ++++ b/dbus_bindings/conn.c +@@ -238,9 +238,7 @@ DBusPyConnection_NewConsumingDBusConnection(PyTypeObject *cls, + self->has_mainloop = (mainloop != Py_None); + self->conn = NULL; + self->filters = PyList_New(0); +-#if !DBUSPY_PY_VERSION_AT_LEAST(3, 12, 0, 0) + self->weaklist = NULL; +-#endif + if (!self->filters) goto err; + self->object_paths = PyDict_New(); + if (!self->object_paths) goto err; +@@ -394,9 +392,7 @@ static void Connection_tp_dealloc(Connection *self) + /* avoid clobbering any pending exception */ + PyErr_Fetch(&et, &ev, &etb); + +-#if !DBUSPY_PY_VERSION_AT_LEAST(3, 12, 0, 0) + if (self->weaklist) +-#endif + { + PyObject_ClearWeakRefs((PyObject *)self); + } +@@ -460,19 +456,12 @@ PyTypeObject DBusPyConnection_Type = { + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ +-#if DBUSPY_PY_VERSION_AT_LEAST(3, 12, 0, 0) +- Py_TPFLAGS_MANAGED_WEAKREF | +-#endif + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, + Connection_tp_doc, /*tp_doc*/ + 0, /*tp_traverse*/ + 0, /*tp_clear*/ + 0, /*tp_richcompare*/ +-#if DBUSPY_PY_VERSION_AT_LEAST(3, 12, 0, 0) +- 0, /*tp_weaklistoffset*/ +-#else + offsetof(Connection, weaklist), /*tp_weaklistoffset*/ +-#endif + 0, /*tp_iter*/ + 0, /*tp_iternext*/ + DBusPyConnection_tp_methods, /*tp_methods*/ +diff --git a/dbus_bindings/server.c b/dbus_bindings/server.c +index d250a1d..9382fe6 100644 +--- a/dbus_bindings/server.c ++++ b/dbus_bindings/server.c +@@ -38,10 +38,8 @@ typedef struct { + /* The Connection subtype for which this Server is a factory */ + PyObject *conn_class; + +-#if !DBUSPY_PY_VERSION_AT_LEAST(3, 12, 0, 0) + /* Weak-references list to make server weakly referenceable */ + PyObject *weaklist; +-#endif + + PyObject *mainloop; + } Server; +@@ -425,9 +423,7 @@ Server_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) + return NULL; + } + +-#if !DBUSPY_PY_VERSION_AT_LEAST(3, 12, 0, 0) + ((Server *)self)->weaklist = NULL; +-#endif + TRACE(self); + + return self; +@@ -442,9 +438,7 @@ static void Server_tp_dealloc(Server *self) + /* avoid clobbering any pending exception */ + PyErr_Fetch(&et, &ev, &etb); + +-#if !DBUSPY_PY_VERSION_AT_LEAST(3, 12, 0, 0) + if (self->weaklist) +-#endif + { + PyObject_ClearWeakRefs((PyObject *)self); + } +@@ -577,19 +571,12 @@ PyTypeObject DBusPyServer_Type = { + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ +-#if DBUSPY_PY_VERSION_AT_LEAST(3, 12, 0, 0) +- Py_TPFLAGS_MANAGED_WEAKREF | +-#endif + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, + Server_tp_doc, /*tp_doc*/ + 0, /*tp_traverse*/ + 0, /*tp_clear*/ + 0, /*tp_richcompare*/ +-#if DBUSPY_PY_VERSION_AT_LEAST(3, 12, 0, 0) +- 0, /*tp_weaklistoffset*/ +-#else + offsetof(Server, weaklist), /*tp_weaklistoffset*/ +-#endif + 0, /*tp_iter*/ + 0, /*tp_iternext*/ + DBusPyServer_tp_methods,/*tp_methods*/ +-- +2.52.0 + diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index bb3b873..61fa6db 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -10,9 +10,13 @@ package: source: url: https://pypi.org/packages/source/d/dbus-python/dbus-python-${{ version }}.tar.gz sha256: 991666e498f60dbf3e49b8b7678f5559b8a65034fdf61aae62cdecdb7d89c770 + patches: + # https://src.fedoraproject.org/rpms/dbus-python/raw/rawhide/f/Revert-using-Py_TPFLAGS_MANAGED_WEAKREF.patch + # (for python 3.15 compatibility) + - patches/Revert-using-Py_TPFLAGS_MANAGED_WEAKREF.patch build: - number: 0 + number: 1 skip: win script: ${{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation @@ -36,6 +40,7 @@ requirements: - meson-python >=0.8.1 - pip >=21.3 - python + - libpython run: - dbus - python
VariantStatus
osx_64_python3.10.____cpythonosx_64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315 - variant + variant
osx_64_python3.11.____cpythonosx_64_channel_sourcesconda-forgepython3.11.____cpython - variant + variant
osx_64_python3.12.____cpythonosx_64_channel_sourcesconda-forgepython3.12.____cpython - variant + variant
osx_64_python3.13.____cp313osx_64_channel_sourcesconda-forgepython3.13.____cp313 - variant + variant
osx_64_python3.14.____cp314osx_64_channel_sourcesconda-forgepython3.14.____cp314 - variant + variant
osx_arm64_python3.10.____cpythonosx_arm64_channel_sourcesconda-forgeconda-forgelabelpython_rcpython3.15.____cp315 - variant + variant
osx_arm64_python3.11.____cpythonosx_arm64_channel_sourcesconda-forgepython3.11.____cpython - variant + variant
osx_arm64_python3.12.____cpythonosx_arm64_channel_sourcesconda-forgepython3.12.____cpython - variant + variant
osx_arm64_python3.13.____cp313osx_arm64_channel_sourcesconda-forgepython3.13.____cp313 - variant + variant
osx_arm64_python3.14.____cp314osx_arm64_channel_sourcesconda-forgepython3.14.____cp314 - variant + variant