From e8e5bf5d817f5a8b590c8da4b21ebd8d4550f267 Mon Sep 17 00:00:00 2001 From: Ailin Nemui Date: Mon, 16 Dec 2024 20:43:48 +0100 Subject: [PATCH] patch old setuptools for python 3.12 for github workflow --- .github/workflows/check.yml | 24 ++++++++++++++++++++++++ utils/make-dist.sh | 9 +++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 37b59749..67465f1a 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -20,6 +20,30 @@ jobs: run: | sudo apt update && sudo apt install $apt_build_deps eval "$get_pip_build_deps_meson" + patch ~/.local/lib/python3.12/site-packages/pkg_resources/__init__.py <<- PATCH + --- __init__.py 2024-12-16 20:37:46.733230351 +0100 + +++ __init__.py 2024-12-16 20:38:42.479554540 +0100 + @@ -2188,7 +2188,8 @@ def resolve_egg_link(path): + return next(dist_groups, ()) + + + -register_finder(pkgutil.ImpImporter, find_on_path) + +if hasattr(pkgutil, 'ImpImporter'): + + register_finder(pkgutil.ImpImporter, find_on_path) + + if hasattr(importlib_machinery, 'FileFinder'): + register_finder(importlib_machinery.FileFinder, find_on_path) + @@ -2345,7 +2346,8 @@ def file_ns_handler(importer, path_item, + return subpath + + + -register_namespace_handler(pkgutil.ImpImporter, file_ns_handler) + +if hasattr(pkgutil, 'ImpImporter'): + + register_namespace_handler(pkgutil.ImpImporter, file_ns_handler) + register_namespace_handler(zipimport.zipimporter, file_ns_handler) + + if hasattr(importlib_machinery, 'FileFinder'): + PATCH - uses: actions/checkout@main - name: make dist run: | diff --git a/utils/make-dist.sh b/utils/make-dist.sh index 3ea56599..81d450d7 100755 --- a/utils/make-dist.sh +++ b/utils/make-dist.sh @@ -80,10 +80,11 @@ echo "Creating sdist..." python3 -W ignore -c 'from setuptools import *;setup()' --quiet sdist --formats=tar tar --delete --file "dist/$name-$version.tar" \ - "$name-$version/setup.cfg" \ - "$name-$version/pyproject.toml" \ - "$name-$version/$name.egg-info" \ - "$name-$version/PKG-INFO" + $(tar tf "dist/$name-$version.tar" | grep -F \ + "$name-$version/setup.cfg +$name-$version/pyproject.toml +$name-$version/$name.egg-info +$name-$version/PKG-INFO") echo "Zipping..." xz -k "dist/$name-$version.tar"