From d43b57d2ce8552ed4977dcc33667b4226fe3333b Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Wed, 23 Nov 2016 15:52:06 +0100 Subject: ipalib: remove hard dependency on ipapython Hard-code the path to /bin/false in SubprocessError doc string. Remove ipaplatform dependency from ipalib's setup.py and add it as optional installer dependency to ipalib's and ipaclient's setup.py. https://fedorahosted.org/freeipa/ticket/6474 Reviewed-By: Stanislav Laznicka --- ipalib/errors.py | 3 +-- ipalib/setup.py | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'ipalib') diff --git a/ipalib/errors.py b/ipalib/errors.py index 86d758b98..d1fe5f0ac 100644 --- a/ipalib/errors.py +++ b/ipalib/errors.py @@ -108,7 +108,6 @@ import six from ipalib.text import ngettext as ungettext from ipalib import messages -from ipaplatform.paths import paths # pylint: disable=unused-import class PrivateError(Exception): @@ -151,7 +150,7 @@ class SubprocessError(PrivateError): The exit code of the sub-process is available via the ``returncode`` instance attribute. For example: - >>> e = SubprocessError(returncode=1, argv=(paths.BIN_FALSE,)) + >>> e = SubprocessError(returncode=1, argv=('/bin/false',)) >>> e.returncode 1 >>> e.argv # argv is also available diff --git a/ipalib/setup.py b/ipalib/setup.py index 98af7abd1..85932fcd7 100644 --- a/ipalib/setup.py +++ b/ipalib/setup.py @@ -37,7 +37,6 @@ if __name__ == '__main__': "ipalib.install", ], install_requires=[ - "ipaplatform", "ipapython", "netaddr", "pyasn1", @@ -47,4 +46,7 @@ if __name__ == '__main__': setup_requires=[ "wheel", ], + extras_require={ + "ipalib.install": ["ipaplatform"], + }, ) -- cgit