From 1815ad27684435a0612c987b5d6d8893417593f8 Mon Sep 17 00:00:00 2001 From: Prashanth Pai Date: Thu, 10 Mar 2016 11:38:07 +0530 Subject: Fix and simplify tox.ini * Remove deprecated tox options * Simplify tox.ini * Update .gitignore * Update test-requirements.txt * Fix pep8 issues All tests now run on centos7 without any modifications. Code coverage output is now displayed properly for both unit test and functional test runs. Change-Id: I877cc0ad2c560579c12d528af3ac9bf5eea28378 Signed-off-by: Prashanth Pai --- gluster/__init__.py | 4 +--- gluster/api.py | 10 ++++------ 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'gluster') diff --git a/gluster/__init__.py b/gluster/__init__.py index 4562ec8..351a4f3 100644 --- a/gluster/__init__.py +++ b/gluster/__init__.py @@ -41,9 +41,7 @@ class PkgInfo(object): return '%s-dev' % (self.canonical_version,) -### -### Change the Package version here -### +# Change the Package version here _pkginfo = PkgInfo('0.0.1', '0', 'python-libgfapi', False) __version__ = _pkginfo.pretty_version __canonical_version__ = _pkginfo.canonical_version diff --git a/gluster/api.py b/gluster/api.py index c0bad67..7163076 100755 --- a/gluster/api.py +++ b/gluster/api.py @@ -200,7 +200,7 @@ class Dirent (ctypes.Structure): # glfs_posix_lock; # glfs_dup; # -# } +# } # # GFAPI_3.4.2 { # glfs_setfsuid; @@ -478,10 +478,8 @@ glfs_getcwd = gfapi_prototype('glfs_getcwd', ctypes.c_char_p, # TODO: # discard and fallocate fails with "AttributeError: /lib64/libgfapi.so.0: undefined symbol: glfs_discard", # noqa # for time being, using it from api.* # noqa # glfs_discard = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_void_p, ctypes.c_ulong, ctypes.c_size_t)(('glfs_discard', client)) # noqa -#_glfs_fallocate = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_void_p, ctypes.c_int, ctypes.c_ulong, ctypes.c_size_t) # noqa +# _glfs_fallocate = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_void_p, ctypes.c_int, ctypes.c_ulong, ctypes.c_size_t) # noqa # (('glfs_fallocate', client)) # noqa - - -#glfs_discard = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_void_p, ctypes.c_ulong, ctypes.c_size_t)(('glfs_discard', client)) # noqa -#glfs_fallocate = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_void_p, ctypes.c_int, ctypes.c_ulong, ctypes.c_size_t)(('glfs_fallocate', client)) # noqa +# glfs_discard = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_void_p, ctypes.c_ulong, ctypes.c_size_t)(('glfs_discard', client)) # noqa +# glfs_fallocate = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_void_p, ctypes.c_int, ctypes.c_ulong, ctypes.c_size_t)(('glfs_fallocate', client)) # noqa -- cgit