diff options
| author | Christian Heimes <cheimes@redhat.com> | 2016-11-17 16:43:17 +0100 |
|---|---|---|
| committer | Martin Babinsky <mbabinsk@redhat.com> | 2016-11-30 13:32:30 +0100 |
| commit | ed9645b2ac58fd4664810f05970ea258c7948420 (patch) | |
| tree | 9b336c673e66be9f442e5d1336d3fc09e7df75dc | |
| parent | 38cc40ddb5bf965801500bb4f66fd965b12e3c88 (diff) | |
| download | freeipa-ed9645b2ac58fd4664810f05970ea258c7948420.tar.gz freeipa-ed9645b2ac58fd4664810f05970ea258c7948420.tar.xz freeipa-ed9645b2ac58fd4664810f05970ea258c7948420.zip | |
Adjustments for setup requirements
* Fix some typos, missing or surplus dependencies.
* Remove setup requirement on wheel since it triggers download.
ipatests is now installable. Tests need further changes to be runable.
https://fedorahosted.org/freeipa/ticket/6468
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rw-r--r-- | ipaclient/setup.py | 7 | ||||
| -rw-r--r-- | ipalib/setup.py | 1 | ||||
| -rw-r--r-- | ipaplatform/setup.py | 3 | ||||
| -rwxr-xr-x | ipapython/setup.py | 4 | ||||
| -rwxr-xr-x | ipaserver/setup.py | 2 | ||||
| -rw-r--r-- | ipasetup.py.in | 4 | ||||
| -rw-r--r-- | ipatests/setup.py | 18 |
7 files changed, 17 insertions, 22 deletions
diff --git a/ipaclient/setup.py b/ipaclient/setup.py index fb6ed0dc5..0183aaf31 100644 --- a/ipaclient/setup.py +++ b/ipaclient/setup.py @@ -48,13 +48,12 @@ if __name__ == '__main__': "ipalib", "ipapython", "python-nss", + "python-yubico", + "pyusb", "qrcode", "six", ], - setup_requires=[ - "wheel", - ], - extra_requires={ + extras_require={ "ipaclient.install": ["ipaplatform"], "otptoken_yubikey": ["yubico", "usb"] } diff --git a/ipalib/setup.py b/ipalib/setup.py index 85932fcd7..4be3eb1b0 100644 --- a/ipalib/setup.py +++ b/ipalib/setup.py @@ -40,6 +40,7 @@ if __name__ == '__main__': "ipapython", "netaddr", "pyasn1", + "pyasn1-modules", "python-nss", "six", ], diff --git a/ipaplatform/setup.py b/ipaplatform/setup.py index b28ac8c65..9c47da716 100644 --- a/ipaplatform/setup.py +++ b/ipaplatform/setup.py @@ -47,7 +47,4 @@ if __name__ == '__main__': "python-nss", "six", ], - setup_requires=[ - "wheel", - ], ) diff --git a/ipapython/setup.py b/ipapython/setup.py index c413ffa6e..86e4131e5 100755 --- a/ipapython/setup.py +++ b/ipapython/setup.py @@ -51,10 +51,8 @@ if __name__ == '__main__': "requests", "six", ], - setup_requires=[ - "wheel", - ], extras_require={ ":python_version<'3'": ["enum34"], + "install": ["dbus-python"], # for certmonger }, ) diff --git a/ipaserver/setup.py b/ipaserver/setup.py index 3635832d4..528b901f3 100755 --- a/ipaserver/setup.py +++ b/ipaserver/setup.py @@ -56,9 +56,9 @@ if __name__ == '__main__': "ipapython", "lxml", "netaddr", - "memcache", "pyasn1", "pyldap", + "python-memcached", "python-nss", "six", # not available on PyPI diff --git a/ipasetup.py.in b/ipasetup.py.in index 1db485730..0d1113577 100644 --- a/ipasetup.py.in +++ b/ipasetup.py.in @@ -62,10 +62,10 @@ PACKAGE_VERSION = { 'ipaserver': 'ipaserver == @VERSION@', 'kdcproxy': 'kdcproxy >= 0.3', 'netifaces': 'netifaces >= 0.10.4', - 'python-nss': 'python-nss >= 0.16', 'pyldap': 'pyldap >= 2.4.15', + 'python-nss': 'python-nss >= 0.16', + 'python-yubico': 'python-yubico >= 1.2.3', 'qrcode': 'qrcode >= 5.0', - # 'yubico': 'yubico >= 1.2.3', } diff --git a/ipatests/setup.py b/ipatests/setup.py index 26f01240b..2b592cd95 100644 --- a/ipatests/setup.py +++ b/ipatests/setup.py @@ -59,24 +59,24 @@ if __name__ == '__main__': }, install_requires=[ "cryptography", - "dbus-python", "dnspython", - "dogtag-pki", + "gssapi", "ipaclient", "ipalib", "ipaplatform", "ipapython", - "ipaserver", "nose", + "polib", "pyldap", "pytest", - "python-gssapi", + "pytest_multihost", "python-nss", - "selenium", "six", - "yaml", - ], - setup_requires=[ - "wheel", ], + extras_require={ + "integration": ["dbus-python", "pyyaml", "ipaserver"], + "ipaserver": ["ipaserver"], + "webui": ["selenium", "pyyaml", "ipaserver"], + "xmlrpc": ["ipaserver"], + } ) |