Skip to content

Fix name collision with lxml's setupinfo.py #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bgaifullin merged 1 commit into from
Aug 15, 2017
Merged

Fix name collision with lxml's setupinfo.py #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from setuptools import Extension
from setuptools.command import build_ext

import setupinfo
import xmlsec_setupinfo


class BuildExt(build_ext.build_ext):
Expand All @@ -12,41 +12,41 @@ def run(self):
build_ext.build_ext.run(self)

def patch_options(self):
ext = self.ext_map[setupinfo.name()]
ext.define_macros.extend(setupinfo.define_macros())
ext.include_dirs.extend(setupinfo.include_dirs())
ext.libraries.extend(setupinfo.libraries())
ext.library_dirs.extend(setupinfo.library_dirs())
ext = self.ext_map[xmlsec_setupinfo.name()]
ext.define_macros.extend(xmlsec_setupinfo.define_macros())
ext.include_dirs.extend(xmlsec_setupinfo.include_dirs())
ext.libraries.extend(xmlsec_setupinfo.libraries())
ext.library_dirs.extend(xmlsec_setupinfo.library_dirs())


_xmlsec = Extension(
setupinfo.name(),
sources=setupinfo.sources(),
extra_compile_args=setupinfo.cflags(),
xmlsec_setupinfo.name(),
sources=xmlsec_setupinfo.sources(),
extra_compile_args=xmlsec_setupinfo.cflags(),
libraries=[],
library_dirs=[],
include_dirs=[],
define_macros=[],
)

setup(
name=setupinfo.name(),
version=setupinfo.version(),
description=setupinfo.description(),
name=xmlsec_setupinfo.name(),
version=xmlsec_setupinfo.version(),
description=xmlsec_setupinfo.description(),
ext_modules=[_xmlsec],
cmdclass={'build_ext': BuildExt},
setup_requires=setupinfo.requirements(),
install_requires=setupinfo.requirements(),
setup_requires=xmlsec_setupinfo.requirements(),
install_requires=xmlsec_setupinfo.requirements(),
author="Bulat Gaifullin",
author_email='[email protected]',
maintainer='Bulat Gaifullin',
maintainer_email='[email protected]',
url='https://github.com/mehcode/python-xmlsec',
download_url="https://github.com/mehcode/python-xmlsec/archive/v%s.tar.gz" % setupinfo.version(),
download_url="https://github.com/mehcode/python-xmlsec/archive/v%s.tar.gz" % xmlsec_setupinfo.version(),
license='MIT',
keywords=["xmlsec"],
classifiers=[
setupinfo.dev_status(),
xmlsec_setupinfo.dev_status(),
'Intended Audience :: Developers',
'Intended Audience :: System Administrators',
'License :: OSI Approved :: MIT License',
Expand Down
0 setupinfo.py → xmlsec_setupinfo.py
View file
Open in desktop
File renamed without changes.