From 490682ac3cab8978635655bdcc880f28227e900b Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Mon, 4 May 2020 19:51:06 +0200 Subject: [PATCH] Make ipaplatform a regular top-level package ipaplatform was made a namespace package so that 3rd party OS distributors can easily define their own distribution subpackage. Since major distributions have contributed to FreeIPA project and no 3rd party ipaplatform subpackage was uploaded to PyPI, it doesn't make much sense to keep ipaplatform a namespace package. The ipaplatform-*-nspkg.pth file for namespace package definition is causing trouble with local testing on developer boxes. Fixes: https://pagure.io/freeipa/issue/8309 See: https://pagure.io/freeipa/issue/6474 Signed-off-by: Christian Heimes Reviewed-By: Alexander Bokovoy --- freeipa.spec.in | 1 - ipaplatform/__init__.py | 7 +------ ipaplatform/setup.py | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 33d7a28d5..118f305c2 100755 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -1418,7 +1418,6 @@ fi %{python3_sitelib}/ipapython-*.egg-info %{python3_sitelib}/ipalib-*.egg-info %{python3_sitelib}/ipaplatform-*.egg-info -%{python3_sitelib}/ipaplatform-*-nspkg.pth %if 0%{?with_ipatests} diff --git a/ipaplatform/__init__.py b/ipaplatform/__init__.py index 1c22346b0..6d7ce3ab1 100644 --- a/ipaplatform/__init__.py +++ b/ipaplatform/__init__.py @@ -1,11 +1,6 @@ # # Copyright (C) 2017 FreeIPA Contributors see COPYING for license # -"""ipaplatform namespace package - -In the presence of a namespace package, any code in this module will be -ignore. +"""ipaplatform package """ -__import__('pkg_resources').declare_namespace(__name__) - NAME = None # initialized by ipaplatform.osinfo diff --git a/ipaplatform/setup.py b/ipaplatform/setup.py index c2e656f3d..20bfc6912 100644 --- a/ipaplatform/setup.py +++ b/ipaplatform/setup.py @@ -31,7 +31,6 @@ if __name__ == '__main__': name="ipaplatform", doc=__doc__, package_dir={'ipaplatform': ''}, - namespace_packages=['ipaplatform'], packages=[ "ipaplatform", "ipaplatform.base",