URL: https://github.com/freeipa/freeipa/pull/255 Author: tiran Title: #255: Adjustments for setup requirements Action: opened
PR body: """ Fix some typos, missing or surplus dependencies. ipatests is now installable. Tests need further changes to be runable. https://fedorahosted.org/freeipa/ticket/6468 Signed-off-by: Christian Heimes <[email protected]> """ 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 9111930c26971e276ba6b29a7e5620c057d96281 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. 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 | 5 ++--- ipalib/setup.py | 1 + ipapython/setup.py | 1 + ipasetup.py.in | 5 +++-- ipatests/setup.py | 14 ++++++++------ 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ipaclient/setup.py b/ipaclient/setup.py index fc5609b..2c10353 100644 --- a/ipaclient/setup.py +++ b/ipaclient/setup.py @@ -48,13 +48,12 @@ "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..a2d113c 100644 --- a/ipalib/setup.py +++ b/ipalib/setup.py @@ -41,6 +41,7 @@ "ipapython", "netaddr", "pyasn1", + "pyasn1-modules", "python-nss", "six", ], diff --git a/ipapython/setup.py b/ipapython/setup.py index 087086e..6743205 100755 --- a/ipapython/setup.py +++ b/ipapython/setup.py @@ -59,6 +59,7 @@ ], extras_require={ ":python_version<'3'": ["enum34"], + "certmonger": ["dbus-python"], }, entry_points={ 'custodia.authorizers': [ diff --git a/ipasetup.py.in b/ipasetup.py.in index 5330956..73bbb8d 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@', @@ -31,6 +31,7 @@ PACKAGE_VERSION = { 'netifaces': 'netifaces >= 0.10.4', 'python-nss': 'python-nss >= 0.16', 'pyldap': 'pyldap >= 2.4.15', + 'pytest': 'pytest < 3.0', 'qrcode': 'qrcode >= 5.0', # 'yubico': 'yubico >= 1.2.3', } diff --git a/ipatests/setup.py b/ipatests/setup.py index 26f0124..1175b05 100644 --- a/ipatests/setup.py +++ b/ipatests/setup.py @@ -59,24 +59,26 @@ }, 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
