Skip to content

Commit 7f347cf

Browse files
author
Sindri Guðmundsson
committed
Fix name collision with lxml's setupinfo.py
When installing (ubuntu and arch, python 3.6.2 and python 3.5.x), lxml installation fails because it tries to import its own `setupinfo.py`, but gets python-xmlsec's `setupinfo.py`. Rename the module to make sure we don't get another name collision.
1 parent 8149774 commit 7f347cf

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

setup.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from setuptools import Extension
33
from setuptools.command import build_ext
44

5-
import setupinfo
5+
import xmlsec_setupinfo
66

77

88
class BuildExt(build_ext.build_ext):
@@ -12,41 +12,41 @@ def run(self):
1212
build_ext.build_ext.run(self)
1313

1414
def patch_options(self):
15-
ext = self.ext_map[setupinfo.name()]
16-
ext.define_macros.extend(setupinfo.define_macros())
17-
ext.include_dirs.extend(setupinfo.include_dirs())
18-
ext.libraries.extend(setupinfo.libraries())
19-
ext.library_dirs.extend(setupinfo.library_dirs())
15+
ext = self.ext_map[xmlsec_setupinfo.name()]
16+
ext.define_macros.extend(xmlsec_setupinfo.define_macros())
17+
ext.include_dirs.extend(xmlsec_setupinfo.include_dirs())
18+
ext.libraries.extend(xmlsec_setupinfo.libraries())
19+
ext.library_dirs.extend(xmlsec_setupinfo.library_dirs())
2020

2121

2222
_xmlsec = Extension(
23-
setupinfo.name(),
24-
sources=setupinfo.sources(),
25-
extra_compile_args=setupinfo.cflags(),
23+
xmlsec_setupinfo.name(),
24+
sources=xmlsec_setupinfo.sources(),
25+
extra_compile_args=xmlsec_setupinfo.cflags(),
2626
libraries=[],
2727
library_dirs=[],
2828
include_dirs=[],
2929
define_macros=[],
3030
)
3131

3232
setup(
33-
name=setupinfo.name(),
34-
version=setupinfo.version(),
35-
description=setupinfo.description(),
33+
name=xmlsec_setupinfo.name(),
34+
version=xmlsec_setupinfo.version(),
35+
description=xmlsec_setupinfo.description(),
3636
ext_modules=[_xmlsec],
3737
cmdclass={'build_ext': BuildExt},
38-
setup_requires=setupinfo.requirements(),
39-
install_requires=setupinfo.requirements(),
38+
setup_requires=xmlsec_setupinfo.requirements(),
39+
install_requires=xmlsec_setupinfo.requirements(),
4040
author="Bulat Gaifullin",
4141
author_email='support@mehcode.com',
4242
maintainer='Bulat Gaifullin',
4343
maintainer_email='gaifullinbf@gmail.com',
4444
url='https://github.com/mehcode/python-xmlsec',
45-
download_url="https://github.com/mehcode/python-xmlsec/archive/v%s.tar.gz" % setupinfo.version(),
45+
download_url="https://github.com/mehcode/python-xmlsec/archive/v%s.tar.gz" % xmlsec_setupinfo.version(),
4646
license='MIT',
4747
keywords=["xmlsec"],
4848
classifiers=[
49-
setupinfo.dev_status(),
49+
xmlsec_setupinfo.dev_status(),
5050
'Intended Audience :: Developers',
5151
'Intended Audience :: System Administrators',
5252
'License :: OSI Approved :: MIT License',
File renamed without changes.

0 commit comments

Comments
 (0)