IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Correct PyPI package dependencies

Browse Source 
* Remove unused install requires from ipapython
* Add missing requirements to ipaserver
* Correct dependencies for yubico otptoken
* Add explicit dependency on cffi for csrgen
* Python 2 uses python-ldap, Python 3 pyldap

https://pagure.io/freeipa/issue/6875

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Christian Heimes
2017-04-26 12:31:11 +02:00
committed by Martin Basti
parent 38276d3473
commit 26ab51ddf4
6 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipasetup.py.in
+12 -4
View File
@@ -101,6 +101,7 @@ common_args = dict(
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: Implementation :: CPython",
"Operating System :: POSIX",
"Operating System :: POSIX :: Linux",
@@ -138,13 +139,20 @@ def ipasetup(name, doc, **kwargs):
cmdclass = setup_kwargs.setdefault('cmdclass', {})
cmdclass['build_py'] = build_py
# Env markers like ":python_version<'3.3'" are not supported by
# Env markers like ":python_version<'3'" are not supported by
# setuptools < 18.0.
if 'extras_require' in setup_kwargs and SETUPTOOLS_VERSION < (18, 0, 0):
for k in list(setup_kwargs['extras_require']):
if k.startswith(':'):
req = setup_kwargs.setdefault('install_requires', [])
req.extend(setup_kwargs['extras_require'].pop(k))
if not k.startswith(':'):
continue
values = setup_kwargs['extras_require'].pop(k)
req = setup_kwargs.setdefault('install_requires', [])
if k == ":python_version<'3'" and sys.version_info.major == 2:
req.extend(values)
elif k == ":python_version>='3'" and sys.version_info.major >= 3:
req.extend(values)
else:
raise ValueError(k, values)
os.chdir(local_path)
try: