diff options
Diffstat (limited to 'debian/patches/setuptools-60.patch')
| -rw-r--r-- | debian/patches/setuptools-60.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/debian/patches/setuptools-60.patch b/debian/patches/setuptools-60.patch new file mode 100644 index 0000000..af27c9e --- /dev/null +++ b/debian/patches/setuptools-60.patch @@ -0,0 +1,43 @@ +From: Stefano Rivera <stefanor@debian.org> +Date: Sat, 12 Nov 2022 22:34:04 +0200 +Subject: Import setuptools before distutils + +setuptools 60 uses its own bundled version of distutils, by default. It +injects this into sys.modules, at import time. So we need to make sure +that it is imported, before anything else imports distutils, to ensure +everything is using the same distutils version. + +This change in setuptools is to prepare for Python 3.12, which will drop +distutils. + +Bug-Debian: https://bugs.debian.org/1022491 +Forwarded: https://github.com/deluge-torrent/deluge/pull/400 +--- + setup.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/setup.py b/setup.py +index 5cae466..fb49f10 100755 +--- a/setup.py ++++ b/setup.py +@@ -15,15 +15,16 @@ import glob + import os + import platform + import sys ++from shutil import rmtree ++ ++from setuptools import find_packages, setup ++from setuptools.command.test import test as _test ++ + from distutils import cmd + from distutils.command.build import build as _build + from distutils.command.clean import clean as _clean + from distutils.command.install_data import install_data as _install_data + from distutils.spawn import find_executable +-from shutil import rmtree +- +-from setuptools import find_packages, setup +-from setuptools.command.test import test as _test + + import msgfmt + from version import get_version |