diff --git a/.ci_support/linux_64_cuda_compiler_version12.8microarch_level1.yaml b/.ci_support/linux_64_cuda_compiler_version12.8microarch_level1.yaml index ac7ecbc6..18200484 100644 --- a/.ci_support/linux_64_cuda_compiler_version12.8microarch_level1.yaml +++ b/.ci_support/linux_64_cuda_compiler_version12.8microarch_level1.yaml @@ -6,10 +6,12 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge +- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main cuda_compiler: @@ -65,6 +67,7 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.13.* *_cp313 +- 3.14.* *_cp314 snappy: - '1.2' sqlite: @@ -78,5 +81,7 @@ zip_keys: - cxx_compiler_version - c_stdlib_version - cuda_compiler_version +- - python + - channel_sources zlib: - '1' diff --git a/.ci_support/linux_64_cuda_compiler_version12.8microarch_level3.yaml b/.ci_support/linux_64_cuda_compiler_version12.8microarch_level3.yaml index 844ddbaa..3228c902 100644 --- a/.ci_support/linux_64_cuda_compiler_version12.8microarch_level3.yaml +++ b/.ci_support/linux_64_cuda_compiler_version12.8microarch_level3.yaml @@ -6,10 +6,12 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge +- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main cuda_compiler: @@ -65,6 +67,7 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.13.* *_cp313 +- 3.14.* *_cp314 snappy: - '1.2' sqlite: @@ -78,5 +81,7 @@ zip_keys: - cxx_compiler_version - c_stdlib_version - cuda_compiler_version +- - python + - channel_sources zlib: - '1' diff --git a/.ci_support/linux_64_cuda_compiler_versionNonemicroarch_level1.yaml b/.ci_support/linux_64_cuda_compiler_versionNonemicroarch_level1.yaml index 4f61b6cd..24282865 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNonemicroarch_level1.yaml +++ b/.ci_support/linux_64_cuda_compiler_versionNonemicroarch_level1.yaml @@ -6,10 +6,12 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge +- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main cuda_compiler: @@ -65,6 +67,7 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.13.* *_cp313 +- 3.14.* *_cp314 snappy: - '1.2' sqlite: @@ -78,5 +81,7 @@ zip_keys: - cxx_compiler_version - c_stdlib_version - cuda_compiler_version +- - python + - channel_sources zlib: - '1' diff --git a/.ci_support/linux_64_cuda_compiler_versionNonemicroarch_level3.yaml b/.ci_support/linux_64_cuda_compiler_versionNonemicroarch_level3.yaml index 9ebe4860..581b0119 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNonemicroarch_level3.yaml +++ b/.ci_support/linux_64_cuda_compiler_versionNonemicroarch_level3.yaml @@ -6,10 +6,12 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge +- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main cuda_compiler: @@ -65,6 +67,7 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.13.* *_cp313 +- 3.14.* *_cp314 snappy: - '1.2' sqlite: @@ -78,5 +81,7 @@ zip_keys: - cxx_compiler_version - c_stdlib_version - cuda_compiler_version +- - python + - channel_sources zlib: - '1' diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml index 52317098..5783ca2b 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml @@ -6,10 +6,12 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_name: -- conda channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge +- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main cuda_compiler: @@ -61,6 +63,7 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.13.* *_cp313 +- 3.14.* *_cp314 snappy: - '1.2' sqlite: @@ -74,5 +77,7 @@ zip_keys: - cxx_compiler_version - c_stdlib_version - cuda_compiler_version +- - python + - channel_sources zlib: - '1' diff --git a/.ci_support/migrations/python314.yaml b/.ci_support/migrations/python314.yaml new file mode 100644 index 00000000..36ec6b41 --- /dev/null +++ b/.ci_support/migrations/python314.yaml @@ -0,0 +1,43 @@ +# this is intentionally sorted before the 3.13t 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 +__migrator: + commit_message: Rebuild for python 3.14 + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython + - 3.13.* *_cp313 + - 3.13.* *_cp313t + - 3.14.* *_cp314 # new entry + paused: false + longterm: true + pr_limit: 5 + 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 + ignored_deps_per_node: + matplotlib: + - pyqt + additional_zip_keys: + - channel_sources + +python: +- 3.14.* *_cp314 +# additional entries to add for zip_keys +is_python_min: +- false +channel_sources: +- conda-forge,conda-forge/label/python_rc diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index dee440d1..fc7a8b71 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -12,6 +12,10 @@ c_stdlib_version: - '10.13' channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge +- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main cuda_compiler: @@ -59,6 +63,7 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.13.* *_cp313 +- 3.14.* *_cp314 snappy: - '1.2' sqlite: @@ -70,5 +75,7 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - channel_sources zlib: - '1' diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 7255132c..0a0a4053 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -12,6 +12,10 @@ c_stdlib_version: - '11.0' channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge +- conda-forge,conda-forge/label/python_rc channel_targets: - conda-forge main cuda_compiler: @@ -59,6 +63,7 @@ python: - 3.11.* *_cpython - 3.12.* *_cpython - 3.13.* *_cp313 +- 3.14.* *_cp314 snappy: - '1.2' sqlite: @@ -70,5 +75,7 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - channel_sources zlib: - '1' diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0b4be6bc..fdb71cca 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @isuruf @farhantejani @ghego @h-vetinari @hajapy @hmaarrfk @jschueller @ngam @njzjz @waitingkuo @wolfv @xhochy \ No newline at end of file +* @farhantejani @ghego @h-vetinari @hajapy @hmaarrfk @isuruf @jschueller @ngam @njzjz @waitingkuo @wolfv @xhochy \ No newline at end of file diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index eaea7f75..55e244e1 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -49,7 +49,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Build on Linux id: build-linux diff --git a/README.md b/README.md index c00d0f63..10c5a24a 100644 --- a/README.md +++ b/README.md @@ -178,12 +178,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 =========== @@ -210,7 +210,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/tensorflow-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: @@ -228,6 +228,7 @@ Feedstock Maintainers * [@h-vetinari](https://github.com/h-vetinari/) * [@hajapy](https://github.com/hajapy/) * [@hmaarrfk](https://github.com/hmaarrfk/) +* [@isuruf](https://github.com/isuruf/) * [@jschueller](https://github.com/jschueller/) * [@ngam](https://github.com/ngam/) * [@njzjz](https://github.com/njzjz/) diff --git a/conda-forge.yml b/conda-forge.yml index b132b6c3..e3823a25 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -4,8 +4,8 @@ azure: settings_osx: timeoutInMinutes: 1 build_platform: - osx_arm64: osx_64 linux_aarch64: linux_64 + osx_arm64: osx_64 conda_build: pkg_format: '2' conda_build_tool: conda-build+conda-libmamba-solver diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bc819186..6853c411 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set version = "2.18.0" %} {% set estimator_version = "2.15.0" %} -{% set build = 2 %} +{% set build = 3 %} {% if cuda_compiler_version != "None" %} {% set build = build + 200 %}