diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 4fe86f5..7871044 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-13 + vmImage: macOS-15 strategy: matrix: osx_64_python3.10.____cpython: diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index e68a8ae..c88cf1b 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -26,6 +24,3 @@ python: - 3.10.* *_cpython 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_python3.11.____cpython.yaml index 4401a62..5f53eef 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -26,6 +24,3 @@ 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_python3.12.____cpython.yaml index 85bd21d..d41b92f 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -26,6 +24,3 @@ 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_python3.13.____cp313.yaml index c2701e6..579a7c2 100644 --- a/.ci_support/linux_64_python3.13.____cp313.yaml +++ b/.ci_support/linux_64_python3.13.____cp313.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -26,6 +24,3 @@ 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_python3.14.____cp314.yaml index 9bff267..bc3eeaa 100644 --- a/.ci_support/linux_64_python3.14.____cp314.yaml +++ b/.ci_support/linux_64_python3.14.____cp314.yaml @@ -6,10 +6,8 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: -- conda-forge,conda-forge/label/python_rc +- conda-forge channel_targets: - conda-forge main dbus: @@ -26,6 +24,3 @@ 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_python3.10.____cpython.yaml index fc3adac..cf73930 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -26,6 +24,3 @@ python: - 3.10.* *_cpython 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_python3.11.____cpython.yaml index 19704f7..ecda311 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -26,6 +24,3 @@ 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_python3.12.____cpython.yaml index a03023a..adacd69 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -26,6 +24,3 @@ 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_python3.13.____cp313.yaml index 548955e..ecd4b61 100644 --- a/.ci_support/linux_aarch64_python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_python3.13.____cp313.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -26,6 +24,3 @@ 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_python3.14.____cp314.yaml index acb300f..93cc006 100644 --- a/.ci_support/linux_aarch64_python3.14.____cp314.yaml +++ b/.ci_support/linux_aarch64_python3.14.____cp314.yaml @@ -6,10 +6,8 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: -- conda-forge,conda-forge/label/python_rc +- conda-forge channel_targets: - conda-forge main dbus: @@ -26,6 +24,3 @@ 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_python3.10.____cpython.yaml index 52b0e86..d6c6b02 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -26,6 +24,3 @@ python: - 3.10.* *_cpython 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_python3.11.____cpython.yaml index f0bb6c7..9c1cb07 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -26,6 +24,3 @@ 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_python3.12.____cpython.yaml index 67b3afa..5c7fd37 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -26,6 +24,3 @@ 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_python3.13.____cp313.yaml index 2efa67f..027704b 100644 --- a/.ci_support/linux_ppc64le_python3.13.____cp313.yaml +++ b/.ci_support/linux_ppc64le_python3.13.____cp313.yaml @@ -6,8 +6,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -26,6 +24,3 @@ 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_python3.14.____cp314.yaml index 1cdfb51..0442ca5 100644 --- a/.ci_support/linux_ppc64le_python3.14.____cp314.yaml +++ b/.ci_support/linux_ppc64le_python3.14.____cp314.yaml @@ -6,10 +6,8 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: -- conda-forge,conda-forge/label/python_rc +- conda-forge channel_targets: - conda-forge main dbus: @@ -26,6 +24,3 @@ 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/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 591d2b2..64a359a 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -28,6 +28,3 @@ python: - 3.10.* *_cpython 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_python3.11.____cpython.yaml index 66fe86d..ca668bc 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -28,6 +28,3 @@ 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_python3.12.____cpython.yaml index 042cec8..46ce65c 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -28,6 +28,3 @@ 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_python3.13.____cp313.yaml index e85b869..d2f260d 100644 --- a/.ci_support/osx_64_python3.13.____cp313.yaml +++ b/.ci_support/osx_64_python3.13.____cp313.yaml @@ -28,6 +28,3 @@ 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_python3.14.____cp314.yaml index a7f0fc5..0608651 100644 --- a/.ci_support/osx_64_python3.14.____cp314.yaml +++ b/.ci_support/osx_64_python3.14.____cp314.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge,conda-forge/label/python_rc +- conda-forge channel_targets: - conda-forge main dbus: @@ -28,6 +28,3 @@ 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_python3.10.____cpython.yaml index db7f7d3..0add693 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -28,6 +28,3 @@ python: - 3.10.* *_cpython 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_python3.11.____cpython.yaml index 2133fb5..e3bf8dd 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -28,6 +28,3 @@ 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_python3.12.____cpython.yaml index fb4f579..dca023f 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -28,6 +28,3 @@ 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_python3.13.____cp313.yaml index 77837c5..a68392b 100644 --- a/.ci_support/osx_arm64_python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_python3.13.____cp313.yaml @@ -28,6 +28,3 @@ 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_python3.14.____cp314.yaml index 6032c65..7825ebf 100644 --- a/.ci_support/osx_arm64_python3.14.____cp314.yaml +++ b/.ci_support/osx_arm64_python3.14.____cp314.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge,conda-forge/label/python_rc +- conda-forge channel_targets: - conda-forge main dbus: @@ -28,6 +28,3 @@ python: - 3.14.* *_cp314 target_platform: - osx-arm64 -zip_keys: -- - python - - channel_sources diff --git a/README.md b/README.md index 1ed1f9a..d999d30 100644 --- a/README.md +++ b/README.md @@ -298,12 +298,12 @@ it is possible to build and upload installable packages to the [conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. -To manage the continuous integration and simplify feedstock maintenance +To manage the continuous integration and simplify feedstock maintenance, [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``. -For more information please check the [conda-forge documentation](https://conda-forge.org/docs/). +For more information, please check the [conda-forge documentation](https://conda-forge.org/docs/). Terminology =========== @@ -330,7 +330,7 @@ merged, the recipe will be re-built and uploaded automatically to the everybody to install and use from the `conda-forge` channel. Note that all branches in the conda-forge/dbus-python-feedstock are immediately built and any created packages are uploaded, so PRs should be based -on branches in forks and branches in the main repository should only be used to +on branches in forks, and branches in the main repository should only be used to build distinct package versions. In order to produce a uniquely identifiable distribution: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 900f812..801e6b3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "dbus-python" %} -{% set version = "1.3.2" %} +{% set version = "1.4.0" %} package: name: {{ name|lower }} @@ -7,13 +7,13 @@ package: source: url: https://pypi.org/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: ad67819308618b5069537be237f8e68ca1c7fcc95ee4a121fe6845b1418248f8 + sha256: 991666e498f60dbf3e49b8b7678f5559b8a65034fdf61aae62cdecdb7d89c770 patches: - 0001-build-with-setuptools.patch - 0002-setup.py-read-MESON_ARGS.patch # [build_platform != target_platform] build: - number: 6 + number: 0 script: {{ PYTHON }} -m pip install . -vv script_env: # need to specify PKG_CONFIG (only when cross-compiling, since it's not included @@ -34,7 +34,10 @@ requirements: host: - dbus - glib + #- meson-python >=0.8.1 - meson >=0.60.0 + - ninja + #- patchelf - pip >=21.3 - python - setuptools