summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHumble Devassy Chirammal <hchiramm@redhat.com>2015-04-15 13:30:34 +0530
committerNiels de Vos <ndevos@redhat.com>2015-05-04 03:15:18 -0700
commit40df2ed4d098d4cd2c6abbed23e497ac3e2e5804 (patch)
treec1e12e92d9a79396f8aba17f116596296a0883a3
parent02223349a0a141d5bd09edcd571a703bb2e5a94d (diff)
glupy: package glupy as a subpackage under gluster namespace
Currently glupy files resides in gluster namespace of python site packages. The other projects like libgfapi-python ..etc are evolving and need to share the gluster namespace. The current structure makes things difficult as all subpackages have its own __init__ files and other files. One subpackage can not any more own gluster namespace. The attempt is to make below structure for gluster namespace so that it is more portable and scalable for future use. <sitepackages>/gluster/ | -- __init__.py | | -- glupy | -- __init__.py -- glupy.py -- ........ | | -- gfapi | -- __init__.py -- gfapi.py -- ........ By above structure clients can import: >>> from gluster import glupy >>> from gluster import gfapi libgfapi-python project has been moved to this structure via http://review.gluster.org/#/c/9668/ Signed-off-by: Humble Devassy Chirammal <hchiramm@redhat.com> Change-Id: I54886200ddb6a4153a74d9e187aeca7cad79ef9e BUG: 1211900 Reviewed-on: http://review.gluster.org/10248 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
-rw-r--r--glusterfs.spec.in4
-rw-r--r--xlators/features/glupy/src/Makefile.am2
-rw-r--r--xlators/features/glupy/src/__init__.py.in2
3 files changed, 6 insertions, 2 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 8b77d656dae..cf40c7fc69c 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -914,6 +914,8 @@ fi
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs*
# Glupy files are in the -extra-xlators package
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy*
+%exclude /usr/lib/python2.7/site-packages/gluster/glupy.py*
+
# sample xlators not generally used or usable
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13*
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/mac-compat*
@@ -955,7 +957,7 @@ fi
# Glupy C shared library
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy.so
# Glupy Python files
-%{python_sitelib}/gluster/glupy.*
+%{python_sitelib}/gluster/glupy/*
# Don't expect a .egg-info file on EL5
%if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) )
%{python_sitelib}/glusterfs_glupy*.egg-info
diff --git a/xlators/features/glupy/src/Makefile.am b/xlators/features/glupy/src/Makefile.am
index 697f0c7e443..0354b1e9dba 100644
--- a/xlators/features/glupy/src/Makefile.am
+++ b/xlators/features/glupy/src/Makefile.am
@@ -15,7 +15,7 @@ glupy_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
noinst_HEADERS = glupy.h
# Install glupy.py into the Python site-packages area
-pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster
+pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster/glupy
pyglupy_PYTHON = glupy.py __init__.py
CLEANFILES =
diff --git a/xlators/features/glupy/src/__init__.py.in b/xlators/features/glupy/src/__init__.py.in
index e69de29bb2d..3ad9513f40e 100644
--- a/xlators/features/glupy/src/__init__.py.in
+++ b/xlators/features/glupy/src/__init__.py.in
@@ -0,0 +1,2 @@
+from pkgutil import extend_path
+__path__ = extend_path(__path__, __name__)