summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x.unittests (renamed from .unittests.sh)0
-rw-r--r--MANIFEST.in7
-rw-r--r--gluster/__init__.py31
-rwxr-xr-xgluster/gfapi.py2
-rw-r--r--setup.py21
5 files changed, 18 insertions, 43 deletions
diff --git a/.unittests.sh b/.unittests
index 70e1c05..70e1c05 100755
--- a/.unittests.sh
+++ b/.unittests
diff --git a/MANIFEST.in b/MANIFEST.in
index 51e5afe..04a2e88 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,8 +1,5 @@
-include README.md LICENSE
-include functional_tests.sh unittests.sh
-include test-requirements.txt
-include tox.ini
+include README.md COPYING-GPLV2 COPYING-LGPLV3 MAINTAINERS
+include .functests .unittests test-requirements.txt tox.ini test/test.conf
recursive-include gluster *.py
recursive-include test *.py
-include test/test.conf
graft doc
diff --git a/gluster/__init__.py b/gluster/__init__.py
index fda7c92..e795df8 100644
--- a/gluster/__init__.py
+++ b/gluster/__init__.py
@@ -10,34 +10,3 @@
from pkgutil import extend_path
__path__ = extend_path(__path__, __name__)
-
-
-class PkgInfo(object):
- def __init__(self, canonical_version, release, name, final):
- self.canonical_version = canonical_version
- self.release = release
- self.name = name
- self.final = final
-
- def save_config(self, filename):
- """
- Creates a file with the package configuration which can be sourced by
- a bash script.
- """
- with open(filename, 'w') as fd:
- fd.write("NAME=%s\n" % self.name)
- fd.write("VERSION=%s\n" % self.canonical_version)
- fd.write("RELEASE=%s\n" % self.release)
-
- @property
- def pretty_version(self):
- if self.final:
- return self.canonical_version
- else:
- return '%s-dev' % (self.canonical_version,)
-
-
-# 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/gfapi.py b/gluster/gfapi.py
index 6186723..222f7a2 100755
--- a/gluster/gfapi.py
+++ b/gluster/gfapi.py
@@ -20,6 +20,8 @@ from gluster import api
from gluster.exceptions import LibgfapiException, Error
from gluster.utils import validate_mount, validate_glfd
+__version__ = '1.0'
+
# TODO: Move this utils.py
python_mode_to_os_flags = {}
diff --git a/setup.py b/setup.py
index 6f68a01..912959b 100644
--- a/setup.py
+++ b/setup.py
@@ -10,18 +10,28 @@
# later), or the GNU General Public License, version 2 (GPLv2), in all
# cases as published by the Free Software Foundation.
+import os
+import re
from setuptools import setup
-from gluster import __canonical_version__ as version
-
-name = 'gfapi'
+# Get version without importing.
+gfapi_file_path = os.path.join(os.path.dirname(__file__), 'gluster/gfapi.py')
+with open(gfapi_file_path) as f:
+ for line in f:
+ match = re.match(r"__version__.*'([0-9.]+)'", line)
+ if match:
+ version = match.group(1)
+ break
+ else:
+ raise Exception("Couldn't find version in setup.py")
setup(
- name=name,
+ name='gfapi',
version=version,
description='Python bindings for GlusterFS libgfapi',
+ long_description='Python bindings for GlusterFS libgfapi',
license='GPLv2 or LGPLv3+',
author='Red Hat, Inc.',
author_email='gluster-devel@gluster.org',
@@ -40,7 +50,4 @@ setup(
'Programming Language :: Python :: 2.7'
'Topic :: System :: Filesystems'
],
- install_requires=[],
- scripts=[],
- entry_points={},
)