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 01cec191ead6a32ad7a71f7dd4080edc18c8630f Mon Sep 17 00:00:00 2001 From: Christian Heimes <chei...@redhat.com> 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. Bump up requirements to sensible versions. Cryptography 0.9 does not even compile on Fedora any more. ipatests is now installable. Tests need further changes to be runable. https://fedorahosted.org/freeipa/ticket/6468 Signed-off-by: Christian Heimes <chei...@redhat.com> --- freeipa.spec.in | 8 ++++---- ipaclient/setup.py | 8 ++------ ipalib/setup.py | 4 +--- ipaplatform/setup.py | 3 --- ipapython/setup.py | 4 +--- ipaserver/setup.py | 5 +---- ipasetup.py.in | 8 ++++---- ipatests/setup.py | 18 +++++++++--------- 8 files changed, 22 insertions(+), 36 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 3865ed8..8788b9c 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -114,7 +114,7 @@ BuildRequires: python-cffi BuildRequires: samba-python BuildRequires: python-setuptools # 0.6: serialization.load_pem_private_key, load_pem_public_key -BuildRequires: python-cryptography >= 0.6 +BuildRequires: python-cryptography >= 1.3 BuildRequires: python-gssapi BuildRequires: pylint >= 1.0 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1096506 @@ -187,7 +187,7 @@ Requires: mod_wsgi Requires: mod_auth_gssapi >= 1.4.0 Requires: mod_nss >= 1.0.8-26 Requires: python-ldap >= 2.4.15 -Requires: python-gssapi >= 1.1.2 +Requires: python-gssapi >= 1.2 Requires: acl Requires: memcached Requires: python-memcached @@ -510,7 +510,7 @@ Requires: gnupg Requires: keyutils Requires: pyOpenSSL Requires: python-nss >= 0.16 -Requires: python-cryptography >= 0.9 +Requires: python-cryptography >= 1.3 Requires: python-netaddr Requires: python-libipa_hbac Requires: python-qrcode-core >= 5.0.0 @@ -554,7 +554,7 @@ Provides: python3-ipapython = %{version}-%{release} Provides: python3-ipaplatform = %{version}-%{release} %{?python_provide:%python_provide python3-ipaplatform} Requires: %{name}-common = %{version}-%{release} -Requires: python3-gssapi >= 1.1.2 +Requires: python3-gssapi >= 1.2 Requires: gnupg Requires: keyutils Requires: python3-pyOpenSSL 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..edc3113 100755 --- a/ipaserver/setup.py +++ b/ipaserver/setup.py @@ -54,9 +54,9 @@ "ipapython", "lxml", "netaddr", - "memcache", "pyasn1", "pyldap", + "python-memcached", "python-nss", "six", # not available on PyPI @@ -66,7 +66,4 @@ # "python-SSSDConfig", # "samba-python", ], - setup_requires=[ - "wheel", - ], ) diff --git a/ipasetup.py.in b/ipasetup.py.in index 1db4857..bdbbbbe 100644 --- a/ipasetup.py.in +++ b/ipasetup.py.in @@ -52,9 +52,9 @@ class build_py(setuptools_build_py): PACKAGE_VERSION = { - 'cryptography': 'cryptography >= 0.9', + 'cryptography': 'cryptography >= 1.3', 'dnspython': 'dnspython >= 1.13', - 'gssapi': 'gssapi > 1.1.2', + 'gssapi': 'gssapi >= 1.2.0', 'ipaclient': 'ipaclient == @VERSION@', 'ipalib': 'ipalib == @VERSION@', 'ipaplatform': 'ipaplatform == @VERSION@', @@ -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 26f0124..2b592cd 100644 --- a/ipatests/setup.py +++ b/ipatests/setup.py @@ -59,24 +59,24 @@ }, 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"], + } )
-- 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