George Rawlinson pushed to branch main at Arch Linux / Packaging / Packages / thefuck
Commits: 939be6fe by loqs at 2026-03-21T21:49:10+00:00 Remove pkg_resources Related https://archlinux.org/todo/python-pkg_resources-deprecation/. - - - - - 4 changed files: - .SRCINFO - PKGBUILD - REUSE.toml - + thefuck-3.32-remove-pkg_resources.patch Changes: ===================================== .SRCINFO ===================================== @@ -24,10 +24,12 @@ pkgbase = thefuck source = thefuck-3.32-remove_imp.patch source = https://github.com/nvbn/thefuck/commit/dd26fb91a0fdec42fc1990bb91eab21e2c44a0a8.patch source = https://github.com/nvbn/thefuck/commit/59500dd5ba08fd4dbefe43f0300336f5c69e37fb.patch + source = thefuck-3.32-remove-pkg_resources.patch sha512sums = 961b9b6dc374cc0b854698455f688cf110adb21cfebd4cb645eb5f1ce11c14de6699bb4d40de86a5f9461273cbfc2eea318a9d437f803dc578dd431966cf26c1 sha512sums = f3dcbfae6a8061d44dd47196ff00e4d5ae065e938ce4c3cf009f107f195e0ea3bcbac2bfb9a2e86ad471c14c9b8991e61490884631291aee41d6a5ad257a4d0a sha512sums = 0adbde0af4ddbeb9f109da7ba7fe616c04ce1a5ed9f78f7eb14b6f0e6aa68da6d615794907e2ac88c5f162a9cabd9218bc2dc7e2cdf91558363d546507b21d68 sha512sums = 63dfa603f674e94e795fe5771c9fcd3314a74724e7368fb787059ae7a5af4e89fa7b44b67e287fb95e8c6798fe1ae49a0c4bcf0ec9741a51aecf3b9387e7ac67 sha512sums = df570dd885f8e9599fe586342bcdc1c56426349c93430593d7bf15edbafe731ae0dd3d40c4f451ac2ea933e18e39d538979ab230b469d3b949b7c95bc6f47e45 + sha512sums = c308753434ae6c1b7ae7905c86bc7b252d0d12cc66c30ae9ba2b00a091c21be92c6831ea8d0ee7e87f908f698f5b01b6172eda62ebac63426fa66d0dd5b9d1a2 pkgname = thefuck ===================================== PKGBUILD ===================================== @@ -17,12 +17,14 @@ source=( $pkgname-3.32-remove_imp.patch https://github.com/nvbn/thefuck/commit/dd26fb91a0fdec42fc1990bb91eab21e2c44a0a8.patch https://github.com/nvbn/thefuck/commit/59500dd5ba08fd4dbefe43f0300336f5c69e37fb.patch + $pkgname-3.32-remove-pkg_resources.patch ) sha512sums=('961b9b6dc374cc0b854698455f688cf110adb21cfebd4cb645eb5f1ce11c14de6699bb4d40de86a5f9461273cbfc2eea318a9d437f803dc578dd431966cf26c1' 'f3dcbfae6a8061d44dd47196ff00e4d5ae065e938ce4c3cf009f107f195e0ea3bcbac2bfb9a2e86ad471c14c9b8991e61490884631291aee41d6a5ad257a4d0a' '0adbde0af4ddbeb9f109da7ba7fe616c04ce1a5ed9f78f7eb14b6f0e6aa68da6d615794907e2ac88c5f162a9cabd9218bc2dc7e2cdf91558363d546507b21d68' '63dfa603f674e94e795fe5771c9fcd3314a74724e7368fb787059ae7a5af4e89fa7b44b67e287fb95e8c6798fe1ae49a0c4bcf0ec9741a51aecf3b9387e7ac67' - 'df570dd885f8e9599fe586342bcdc1c56426349c93430593d7bf15edbafe731ae0dd3d40c4f451ac2ea933e18e39d538979ab230b469d3b949b7c95bc6f47e45') + 'df570dd885f8e9599fe586342bcdc1c56426349c93430593d7bf15edbafe731ae0dd3d40c4f451ac2ea933e18e39d538979ab230b469d3b949b7c95bc6f47e45' + 'c308753434ae6c1b7ae7905c86bc7b252d0d12cc66c30ae9ba2b00a091c21be92c6831ea8d0ee7e87f908f698f5b01b6172eda62ebac63426fa66d0dd5b9d1a2') prepare() { # remove the use of python-mock: https://github.com/nvbn/thefuck/pull/1437 @@ -33,6 +35,7 @@ prepare() { patch -Np1 -d $pkgname-$pkgver -i ../dd26fb91a0fdec42fc1990bb91eab21e2c44a0a8.patch # pytest v8.x compatibility: https://github.com/nvbn/thefuck/pull/1474 patch -Np1 -d $pkgname-$pkgver -i ../59500dd5ba08fd4dbefe43f0300336f5c69e37fb.patch + patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-3.32-remove-pkg_resources.patch } build() { ===================================== REUSE.toml ===================================== @@ -25,6 +25,7 @@ SPDX-License-Identifier = "0BSD" path = [ "thefuck-3.32-remove_imp.patch", "thefuck-3.32-remove_mock.patch", + "thefuck-3.32-remove-pkg_resources.patch", ] SPDX-FileCopyrightText = "thefuck contributors" SPDX-License-Identifier = "MIT" ===================================== thefuck-3.32-remove-pkg_resources.patch ===================================== @@ -0,0 +1,25 @@ +diff --git a/setup.py b/setup.py +index 36b13be..fa52982 100755 +--- a/setup.py ++++ b/setup.py +@@ -1,17 +1,17 @@ + #!/usr/bin/env python + from setuptools import setup, find_packages +-import pkg_resources ++import importlib.metadata + import sys + import os + import fastentrypoints + + + try: +- if int(pkg_resources.get_distribution("pip").version.split('.')[0]) < 6: ++ if int(importlib.metadata.version("pip").split('.')[0]) < 6: + print('pip older than 6.0 not supported, please upgrade pip with:\n\n' + ' pip install -U pip') + sys.exit(-1) +-except pkg_resources.DistributionNotFound: ++except importlib.metadata.PackageNotFoundError: + pass + + if os.environ.get('CONVERT_README'): View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/thefuck/-/commit/939be6fe4263048248d030d7120cf39446bf7f66 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/thefuck/-/commit/939be6fe4263048248d030d7120cf39446bf7f66 You're receiving this email because of your account on gitlab.archlinux.org. Manage all notifications: https://gitlab.archlinux.org/-/profile/notifications | Help: https://gitlab.archlinux.org/help
