38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 0850374ad9b83e1057ba67c7f9bf73dd13038df3 Mon Sep 17 00:00:00 2001
|
|
From: Graham Inggs <ginggs@debian.org>
|
|
Date: Thu, 27 Oct 2022 12:58:29 +0200
|
|
Subject: [PATCH] Fix installation with setuptools >= 60
|
|
|
|
Installation of genshi with recent versions of setuptools fails with:
|
|
`distutils.errors.DistutilsSetupError: each element of 'ext_modules' option must be an Extension instance or 2-tuple`
|
|
Setuptools monkeypatches distutils, so change the ordering of imports so that setuptools is imported before distutils.
|
|
---
|
|
setup.py | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index c14cfa8..b5eb7a3 100755
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -12,8 +12,6 @@
|
|
# individuals. For the exact contribution history, see the revision
|
|
# history and logs, available at http://genshi.edgewall.org/log/.
|
|
|
|
-from distutils.command.build_ext import build_ext
|
|
-from distutils.errors import CCompilerError, DistutilsPlatformError
|
|
import os
|
|
try:
|
|
from setuptools import setup, Extension
|
|
@@ -21,6 +19,8 @@ try:
|
|
except ImportError:
|
|
from distutils.core import setup, Extension
|
|
bdist_egg = None
|
|
+from distutils.command.build_ext import build_ext
|
|
+from distutils.errors import CCompilerError, DistutilsPlatformError
|
|
import sys
|
|
|
|
sys.path.append(os.path.join('doc', 'common'))
|
|
--
|
|
2.39.0.windows.2
|
|
|