From d1d34ccbdf745349be1ef5b5c718138f3de1314f Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Thu, 2 Oct 2014 14:01:21 +0400 Subject: [PATCH] Module refactoring --- {update => pym/update}/__init__.py | 0 {update => pym/update}/datavars.py | 0 {update => pym/update}/emerge_parser.py | 0 {update => pym/update}/package_tools.py | 0 {update => pym/update}/profile.py | 0 {update => pym/update}/update.py | 0 {update => pym/update}/update_info.py | 0 {update => pym/update}/utils/__init__.py | 0 {update => pym/update}/utils/cl_setup_update.py | 0 {update => pym/update}/utils/cl_update.py | 0 {update => pym/update}/utils/cl_update_profile.py | 0 {update => pym/update}/variables/__init__.py | 0 {update => pym/update}/variables/action.py | 0 {update => pym/update}/variables/update.py | 0 {update => pym/update}/wsdl_update.py | 0 setup.py | 15 +++++++++++---- 16 files changed, 11 insertions(+), 4 deletions(-) rename {update => pym/update}/__init__.py (100%) rename {update => pym/update}/datavars.py (100%) rename {update => pym/update}/emerge_parser.py (100%) rename {update => pym/update}/package_tools.py (100%) rename {update => pym/update}/profile.py (100%) rename {update => pym/update}/update.py (100%) rename {update => pym/update}/update_info.py (100%) rename {update => pym/update}/utils/__init__.py (100%) rename {update => pym/update}/utils/cl_setup_update.py (100%) rename {update => pym/update}/utils/cl_update.py (100%) rename {update => pym/update}/utils/cl_update_profile.py (100%) rename {update => pym/update}/variables/__init__.py (100%) rename {update => pym/update}/variables/action.py (100%) rename {update => pym/update}/variables/update.py (100%) rename {update => pym/update}/wsdl_update.py (100%) diff --git a/update/__init__.py b/pym/update/__init__.py similarity index 100% rename from update/__init__.py rename to pym/update/__init__.py diff --git a/update/datavars.py b/pym/update/datavars.py similarity index 100% rename from update/datavars.py rename to pym/update/datavars.py diff --git a/update/emerge_parser.py b/pym/update/emerge_parser.py similarity index 100% rename from update/emerge_parser.py rename to pym/update/emerge_parser.py diff --git a/update/package_tools.py b/pym/update/package_tools.py similarity index 100% rename from update/package_tools.py rename to pym/update/package_tools.py diff --git a/update/profile.py b/pym/update/profile.py similarity index 100% rename from update/profile.py rename to pym/update/profile.py diff --git a/update/update.py b/pym/update/update.py similarity index 100% rename from update/update.py rename to pym/update/update.py diff --git a/update/update_info.py b/pym/update/update_info.py similarity index 100% rename from update/update_info.py rename to pym/update/update_info.py diff --git a/update/utils/__init__.py b/pym/update/utils/__init__.py similarity index 100% rename from update/utils/__init__.py rename to pym/update/utils/__init__.py diff --git a/update/utils/cl_setup_update.py b/pym/update/utils/cl_setup_update.py similarity index 100% rename from update/utils/cl_setup_update.py rename to pym/update/utils/cl_setup_update.py diff --git a/update/utils/cl_update.py b/pym/update/utils/cl_update.py similarity index 100% rename from update/utils/cl_update.py rename to pym/update/utils/cl_update.py diff --git a/update/utils/cl_update_profile.py b/pym/update/utils/cl_update_profile.py similarity index 100% rename from update/utils/cl_update_profile.py rename to pym/update/utils/cl_update_profile.py diff --git a/update/variables/__init__.py b/pym/update/variables/__init__.py similarity index 100% rename from update/variables/__init__.py rename to pym/update/variables/__init__.py diff --git a/update/variables/action.py b/pym/update/variables/action.py similarity index 100% rename from update/variables/action.py rename to pym/update/variables/action.py diff --git a/update/variables/update.py b/pym/update/variables/update.py similarity index 100% rename from update/variables/update.py rename to pym/update/variables/update.py diff --git a/update/wsdl_update.py b/pym/update/wsdl_update.py similarity index 100% rename from update/wsdl_update.py rename to pym/update/wsdl_update.py diff --git a/setup.py b/setup.py index 7890277..0fca098 100755 --- a/setup.py +++ b/setup.py @@ -18,13 +18,21 @@ # limitations under the License. __app__ = "calculate-update" -__version__ = "3.1.8" +__version__ = "3.2.2" +import os +from glob import glob from distutils.core import setup from calculate.install_data import install_data data_files = [('/usr/libexec/calculate', [('data/cl-git-wrapper', 0755)])] +packages = [ + "calculate."+str('.'.join(root.split(os.sep)[1:])) + for root, dirs, files in os.walk('pym/update') + if '__init__.py' in files +] + setup( name=__app__, version=__version__, @@ -33,8 +41,7 @@ setup( author_email="support@calculate.ru", url="http://calculate-linux.org", license="http://www.apache.org/licenses/LICENSE-2.0", - package_dir={'calculate.update': "update"}, + package_dir = {'calculate.update': "pym/update"}, + packages = packages, data_files=data_files, - packages=['calculate.update', 'calculate.update.utils', - 'calculate.update.variables'], cmdclass={'install_data': install_data})