From d4b8804abb876bda9803cee61c6c4298b475e6be Mon Sep 17 00:00:00 2001
From: Prashanth Pai <ppai@redhat.com>
Date: Tue, 9 Aug 2016 14:25:31 +0530
Subject: Simplify packaging

* Rename .unittests.sh to .unitests
* Fix entries in MANIFEST.in file
* Mover version declaration to gfapi.py

TODO: Fix the spec file. That'll be sent as a separate change.

Change-Id: I0cba8964c1ecc337128c8edc9f301fc1d023bd28
Signed-off-by: Prashanth Pai <ppai@redhat.com>
---
 .unittests          | 15 +++++++++++++++
 .unittests.sh       | 15 ---------------
 MANIFEST.in         |  7 ++-----
 gluster/__init__.py | 31 -------------------------------
 gluster/gfapi.py    |  2 ++
 setup.py            | 21 ++++++++++++++-------
 6 files changed, 33 insertions(+), 58 deletions(-)
 create mode 100755 .unittests
 delete mode 100755 .unittests.sh

diff --git a/.unittests b/.unittests
new file mode 100755
index 0000000..70e1c05
--- /dev/null
+++ b/.unittests
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# Copyright (c) 2016 Red Hat, Inc.
+#
+# This file is licensed to you under your choice of the GNU Lesser
+# General Public License, version 3 or any later version (LGPLv3 or
+# later), or the GNU General Public License, version 2 (GPLv2), in all
+# cases as published by the Free Software Foundation.
+
+cd $(dirname $0)/test/unit
+nosetests -v --exe --with-coverage --cover-package gluster --cover-erase --cover-html --cover-branches $@
+
+saved_status=$?
+rm -f .coverage
+exit $saved_status
diff --git a/.unittests.sh b/.unittests.sh
deleted file mode 100755
index 70e1c05..0000000
--- a/.unittests.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2016 Red Hat, Inc.
-#
-# This file is licensed to you under your choice of the GNU Lesser
-# General Public License, version 3 or any later version (LGPLv3 or
-# later), or the GNU General Public License, version 2 (GPLv2), in all
-# cases as published by the Free Software Foundation.
-
-cd $(dirname $0)/test/unit
-nosetests -v --exe --with-coverage --cover-package gluster --cover-erase --cover-html --cover-branches $@
-
-saved_status=$?
-rm -f .coverage
-exit $saved_status
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={},
 )
-- 
cgit