Jakub Klinkovský pushed to branch main at Arch Linux / Packaging / Packages / torchvision
Commits: 6e25a31a by loqs at 2026-03-03T17:43:39+00:00 Remove pkg_resources - Removed upstream in https://github.com/pytorch/vision/commit/766436522f5d2d8190d7bedd33302699005c7acb - Related https://archlinux.org/todo/python-pkg_resources-deprecation/. - - - - - 4 changed files: - .SRCINFO - + 0001-Fix-setup.py-breaks-with-setuptools-82-9386.patch - PKGBUILD - REUSE.toml Changes: ===================================== .SRCINFO ===================================== @@ -22,8 +22,10 @@ pkgbase = torchvision depends = libwebp source = vision-0.25.0.tar.gz::https://github.com/pytorch/vision/archive/v0.25.0.tar.gz source = torchvision-0_17_1-fix-build.patch + source = 0001-Fix-setup.py-breaks-with-setuptools-82-9386.patch b2sums = 030dfea9d216ddc82f40d1efff79e132dd4da117214c8d638cb26a7ed26e85c6fba85806fe8db486d83d5091544b325d30387090ac73d6b467a6be5b474a05d6 b2sums = b2036b9f4102c50cbcf6813e4a5c46d2899c11ab8d20236eadb5ac1f88d927ee0fb809c880ca3ad9194efa8df665a47d05085b5352b804dabe8925836ecfd0f7 + b2sums = 2532345be1043f7406bc0ec63ff758d11c1ab2f70b51392dfd26a23d15765f7993f8d140721951ec1ccd9a9e963e7bfb522f4df393908929adfe1104c6293dc8 pkgname = torchvision pkgdesc = Datasets, transforms, and models specific to computer vision (C++ library only) ===================================== 0001-Fix-setup.py-breaks-with-setuptools-82-9386.patch ===================================== @@ -0,0 +1,42 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: zy1git <[email protected]> +Date: Tue, 17 Feb 2026 16:27:42 -0800 +Subject: [PATCH] Fix setup.py breaks with setuptools>=82 (#9386) + +Co-authored-by: Zhitao Yu <[email protected]> +(cherry picked from commit 766436522f5d2d8190d7bedd33302699005c7acb) +--- + setup.py | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index c3ba164007..332282a258 100644 +--- a/setup.py ++++ b/setup.py +@@ -8,10 +8,11 @@ import subprocess + import sys + import sysconfig + import warnings ++from importlib.metadata import distribution, PackageNotFoundError + from pathlib import Path + + import torch +-from pkg_resources import DistributionNotFound, get_distribution, parse_version ++from packaging.version import parse as parse_version + from setuptools import find_packages, setup + from torch.utils.cpp_extension import BuildExtension, CppExtension, CUDA_HOME, CUDAExtension, ROCM_HOME + +@@ -92,8 +93,8 @@ def write_version_file(version, sha): + def get_requirements(): + def get_dist(pkgname): + try: +- return get_distribution(pkgname) +- except DistributionNotFound: ++ return distribution(pkgname) ++ except PackageNotFoundError: + return None + + pytorch_dep = os.getenv("TORCH_PACKAGE_NAME", "torch") +-- +2.51.0 + ===================================== PKGBUILD ===================================== @@ -38,15 +38,19 @@ makedepends=( ) source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/pytorch/vision/archive/v${pkgver}.tar.gz"; "torchvision-0_17_1-fix-build.patch" + "0001-Fix-setup.py-breaks-with-setuptools-82-9386.patch" ) b2sums=('030dfea9d216ddc82f40d1efff79e132dd4da117214c8d638cb26a7ed26e85c6fba85806fe8db486d83d5091544b325d30387090ac73d6b467a6be5b474a05d6' - 'b2036b9f4102c50cbcf6813e4a5c46d2899c11ab8d20236eadb5ac1f88d927ee0fb809c880ca3ad9194efa8df665a47d05085b5352b804dabe8925836ecfd0f7') + 'b2036b9f4102c50cbcf6813e4a5c46d2899c11ab8d20236eadb5ac1f88d927ee0fb809c880ca3ad9194efa8df665a47d05085b5352b804dabe8925836ecfd0f7' + '2532345be1043f7406bc0ec63ff758d11c1ab2f70b51392dfd26a23d15765f7993f8d140721951ec1ccd9a9e963e7bfb522f4df393908929adfe1104c6293dc8') prepare() { cd "${srcdir}/${_pkgname}-${pkgver}" # https://github.com/pytorch/vision/issues/8307 patch -N -i "${srcdir}"/torchvision-0_17_1-fix-build.patch + # Remove pkg_resources use + patch -Np1 -i "${srcdir}"/0001-Fix-setup.py-breaks-with-setuptools-82-9386.patch cp -a "${srcdir}/${_pkgname}-${pkgver}" "${srcdir}/${_pkgname}-cuda-${pkgver}" cp -a "${srcdir}/${_pkgname}-${pkgver}" "${srcdir}/python-${_pkgname}-${pkgver}" ===================================== REUSE.toml ===================================== @@ -24,6 +24,7 @@ SPDX-License-Identifier = "0BSD" [[annotations]] path = [ "torchvision-0_17_1-fix-build.patch", + "0001-Fix-setup.py-breaks-with-setuptools-82-9386.patch", ] SPDX-FileCopyrightText = "torchvision contributors" SPDX-License-Identifier = "BSD-3-Clause" View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/torchvision/-/commit/6e25a31a08909d608b39e46ef498fcdbc93bd809 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/torchvision/-/commit/6e25a31a08909d608b39e46ef498fcdbc93bd809 You're receiving this email because of your account on gitlab.archlinux.org.
