diff options
author | Michal Minar <miminar@redhat.com> | 2012-11-08 10:19:39 +0100 |
---|---|---|
committer | Michal Minar <miminar@redhat.com> | 2012-11-08 10:19:39 +0100 |
commit | 12d87d9ddfc6f66c336727c1c9fe3ad123d8b900 (patch) | |
tree | 5c11a873ecbc323066a34a36a71e57108c75c788 /src/software | |
parent | ff3d4f0da089a9012b980336ce416d66c52c31b1 (diff) | |
download | openlmi-providers-12d87d9ddfc6f66c336727c1c9fe3ad123d8b900.tar.gz openlmi-providers-12d87d9ddfc6f66c336727c1c9fe3ad123d8b900.tar.xz openlmi-providers-12d87d9ddfc6f66c336727c1c9fe3ad123d8b900.zip |
added python namespace package called openlmi
This is aimed to be a common package for all openlmi python providers.
It allows using fully-qualified imports in provider source packages.
Diffstat (limited to 'src/software')
-rw-r--r-- | src/software/providers/LMI_SoftwareFileCheck.py | 2 | ||||
-rw-r--r-- | src/software/providers/LMI_SoftwareInstalledPackage.py | 6 | ||||
-rw-r--r-- | src/software/providers/LMI_SoftwarePackage.py | 2 | ||||
-rw-r--r-- | src/software/providers/LMI_SoftwarePackageChecks.py | 6 | ||||
-rw-r--r-- | src/software/providers/util/common.py | 2 | ||||
-rw-r--r-- | src/software/setup.py | 6 |
6 files changed, 13 insertions, 11 deletions
diff --git a/src/software/providers/LMI_SoftwareFileCheck.py b/src/software/providers/LMI_SoftwareFileCheck.py index 7e1782c..d6bc03d 100644 --- a/src/software/providers/LMI_SoftwareFileCheck.py +++ b/src/software/providers/LMI_SoftwareFileCheck.py @@ -23,7 +23,7 @@ Instruments the CIM class LMI_SoftwareFileCheck import pywbem from pywbem.cim_provider2 import CIMProvider2 -from util.common import * +from openlmi.software.util.common import * filecheck2model = SoftwareFileCheck.filecheck_wrapper( 'root/cimv2', 'LMI_SoftwareFileCheck') diff --git a/src/software/providers/LMI_SoftwareInstalledPackage.py b/src/software/providers/LMI_SoftwareInstalledPackage.py index 5b00508..5efee39 100644 --- a/src/software/providers/LMI_SoftwareInstalledPackage.py +++ b/src/software/providers/LMI_SoftwareInstalledPackage.py @@ -25,9 +25,9 @@ Instruments the CIM class LMI_SoftwareInstalledPackage import itertools import pywbem from pywbem.cim_provider2 import CIMProvider2 -from LMI_SoftwarePackage import pkg2model, LMI_SoftwarePackage -from LMI_SoftwareFileCheck import filecheck2model -from util.common import * +from openlmi.software.LMI_SoftwarePackage import pkg2model, LMI_SoftwarePackage +from openlmi.software.LMI_SoftwareFileCheck import filecheck2model +from openlmi.software.util.common import * class LMI_SoftwareInstalledPackage(CIMProvider2): """Instrument the CIM class LMI_SoftwareInstalledPackage diff --git a/src/software/providers/LMI_SoftwarePackage.py b/src/software/providers/LMI_SoftwarePackage.py index 9ef3266..31386a7 100644 --- a/src/software/providers/LMI_SoftwarePackage.py +++ b/src/software/providers/LMI_SoftwarePackage.py @@ -26,7 +26,7 @@ import itertools import datetime import pywbem from pywbem.cim_provider2 import CIMProvider2 -from util.common import * +from openlmi.software.util.common import * pkg2model = SoftwarePackage.pkg2model_wrapper('root/cimv2', "LMI_SoftwarePackage") diff --git a/src/software/providers/LMI_SoftwarePackageChecks.py b/src/software/providers/LMI_SoftwarePackageChecks.py index 797e958..f659aad 100644 --- a/src/software/providers/LMI_SoftwarePackageChecks.py +++ b/src/software/providers/LMI_SoftwarePackageChecks.py @@ -23,9 +23,9 @@ Instruments the CIM class LMI_SoftwarePackageChecks import pywbem from pywbem.cim_provider2 import CIMProvider2 -from LMI_SoftwareFileCheck import filecheck2model -from LMI_SoftwarePackage import pkg2model -from util.common import * +from openlmi.software.LMI_SoftwareFileCheck import filecheck2model +from openlmi.software.LMI_SoftwarePackage import pkg2model +from openlmi.software.util.common import * class LMI_SoftwarePackageChecks(CIMProvider2): """Instrument the CIM class LMI_SoftwarePackageChecks diff --git a/src/software/providers/util/common.py b/src/software/providers/util/common.py index 4c73830..2edf59f 100644 --- a/src/software/providers/util/common.py +++ b/src/software/providers/util/common.py @@ -34,7 +34,7 @@ import stat import pywbem import yum import cmpi_pywbem_bindings as pycimmb -import singletonmixin +import openlmi.software.util import singletonmixin re_evra = re.compile(r'^(?P<epoch>\d+):(?P<ver>[^-]+)' r'-(?P<rel>.+)\.(?P<arch>[^.]+)$') diff --git a/src/software/setup.py b/src/software/setup.py index cd60cc0..6986470 100644 --- a/src/software/setup.py +++ b/src/software/setup.py @@ -1,13 +1,15 @@ -from distutils.core import setup +from setuptools import setup setup( name='openlmi-software', description='Software Management providers', author='Michal Minar', author_email='miminar@redhat.com', url='https://fedorahosted.org/openlmi/', - version='0.4', + version='0.5', + package=['openlmi'], package_dir={'openlmi.software': 'providers'}, packages=['openlmi.software', 'openlmi.software.util'], + install_requires=['openlmi'] classifiers=[ 'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)', 'Operating System :: POSIX :: Linux', |