diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-11-23 15:52:06 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-29 14:50:51 +0100 |
| commit | d43b57d2ce8552ed4977dcc33667b4226fe3333b (patch) | |
| tree | 6f752b484934634b5ec1c6d01317e5783364ebb6 | |
| parent | 977050c66bccd7b8cf468c115d73250505a01034 (diff) | |
| download | freeipa-d43b57d2ce8552ed4977dcc33667b4226fe3333b.tar.gz freeipa-d43b57d2ce8552ed4977dcc33667b4226fe3333b.tar.xz freeipa-d43b57d2ce8552ed4977dcc33667b4226fe3333b.zip | |
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 <slaznick@redhat.com>
| -rw-r--r-- | ipaclient/setup.py | 1 | ||||
| -rw-r--r-- | ipalib/errors.py | 3 | ||||
| -rw-r--r-- | ipalib/setup.py | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/ipaclient/setup.py b/ipaclient/setup.py index fc5609bc3..fb6ed0dc5 100644 --- a/ipaclient/setup.py +++ b/ipaclient/setup.py @@ -55,6 +55,7 @@ if __name__ == '__main__': "wheel", ], extra_requires={ + "ipaclient.install": ["ipaplatform"], "otptoken_yubikey": ["yubico", "usb"] } ) 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"], + }, ) |