URL: https://github.com/freeipa/freeipa/pull/255 Author: tiran Title: #255: Adjustments for setup requirements Action: synchronized
To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/255/head:pr255 git checkout pr255
From 2b9c49f80d0162e503ea16b9a413786dd1c2cee5 Mon Sep 17 00:00:00 2001 From: Christian Heimes <[email protected]> Date: Thu, 17 Nov 2016 16:43:17 +0100 Subject: [PATCH] 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 <[email protected]> --- ipaclient/setup.py | 8 ++------ ipalib/setup.py | 4 +--- ipaplatform/setup.py | 3 --- ipapython/setup.py | 4 +--- ipaserver/setup.py | 3 --- ipasetup.py.in | 9 +++++---- ipatests/setup.py | 17 ++++++++--------- 7 files changed, 17 insertions(+), 31 deletions(-) diff --git a/ipaclient/setup.py b/ipaclient/setup.py index fc5609b..e3ec079 100644 --- a/ipaclient/setup.py +++ b/ipaclient/setup.py @@ -48,13 +48,9 @@ "ipalib", "ipapython", "python-nss", + "python-yubico", + "pyusb", "qrcode", "six", ], - setup_requires=[ - "wheel", - ], - extra_requires={ - "otptoken_yubikey": ["yubico", "usb"] - } ) diff --git a/ipalib/setup.py b/ipalib/setup.py index 98af7ab..94d78de 100644 --- a/ipalib/setup.py +++ b/ipalib/setup.py @@ -41,10 +41,8 @@ "ipapython", "netaddr", "pyasn1", + "pyasn1-modules", "python-nss", "six", ], - setup_requires=[ - "wheel", - ], ) diff --git a/ipaplatform/setup.py b/ipaplatform/setup.py index 97311de..98a9f08 100644 --- a/ipaplatform/setup.py +++ b/ipaplatform/setup.py @@ -46,7 +46,4 @@ "python-nss", "six", ], - setup_requires=[ - "wheel", - ], ) diff --git a/ipapython/setup.py b/ipapython/setup.py index 087086e..772ecfd 100755 --- a/ipapython/setup.py +++ b/ipapython/setup.py @@ -54,11 +54,9 @@ "requests", "six", ], - setup_requires=[ - "wheel", - ], extras_require={ ":python_version<'3'": ["enum34"], + "certmonger": ["dbus-python"], }, entry_points={ 'custodia.authorizers': [ diff --git a/ipaserver/setup.py b/ipaserver/setup.py index 5c38843..2009042 100755 --- a/ipaserver/setup.py +++ b/ipaserver/setup.py @@ -66,7 +66,4 @@ # "python-SSSDConfig", # "samba-python", ], - setup_requires=[ - "wheel", - ], ) diff --git a/ipasetup.py.in b/ipasetup.py.in index 5330956..64db5dc 100644 --- a/ipasetup.py.in +++ b/ipasetup.py.in @@ -19,9 +19,9 @@ import sys PACKAGE_VERSION = { - 'cryptography': 'cryptography >= 0.9', + 'cryptography': 'cryptography >= 1.5', 'dnspython': 'dnspython >= 1.11.1', - 'gssapi': 'gssapi > 1.1.2', + 'gssapi': 'gssapi >= 1.2.0', 'ipaclient': 'ipaclient == @VERSION@', 'ipalib': 'ipalib == @VERSION@', 'ipaplatform': 'ipaplatform == @VERSION@', @@ -29,10 +29,11 @@ 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', + 'pytest': 'pytest < 3.0', + '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 26f0124..b57226d 100644 --- a/ipatests/setup.py +++ b/ipatests/setup.py @@ -59,24 +59,23 @@ }, install_requires=[ "cryptography", - "dbus-python", "dnspython", - "dogtag-pki", + "gssapi", "ipaclient", "ipalib", "ipaplatform", "ipapython", - "ipaserver", "nose", "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"], + } )
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
