Updating imports (#12)

* Updating imports * Integration "__version__" directly in module
tdegeus · Nov 28, 2019 · 0ad2a96 · 0ad2a96
1 parent fd91dcc
commit 0ad2a96
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/GooseHDF5/__init__.py b/GooseHDF5/__init__.py
@@ -5,6 +5,8 @@
 import re
 import h5py
 
+__version__ = '0.1.2'
+
 # ==================================================================================================
 
 def abspath(path):

diff --git a/GooseHDF5/cli/G5check.py b/GooseHDF5/cli/G5check.py
@@ -29,11 +29,10 @@
 import re
 import h5py
 import docopt
-import pkg_resources
 
-__version__ = pkg_resources.require("GooseHDF5")[0].version
-
-from .. import *
+from .. import __version__
+from .. import getdatasets
+from .. import verify
 
 # ==================================================================================================
 

diff --git a/GooseHDF5/cli/G5compare.py b/GooseHDF5/cli/G5compare.py
@@ -31,11 +31,9 @@
 import re
 import h5py
 import docopt
-import pkg_resources
 
-__version__ = pkg_resources.require("GooseHDF5")[0].version
-
-from .. import *
+from .. import __version__
+from .. import getpaths
 
 # ==================================================================================================
 

diff --git a/GooseHDF5/cli/G5list.py b/GooseHDF5/cli/G5list.py
@@ -30,11 +30,9 @@
 import re
 import h5py
 import docopt
-import pkg_resources
 
-__version__ = pkg_resources.require("GooseHDF5")[0].version
-
-from .. import *
+from .. import __version__
+from .. import getpaths
 
 # ==================================================================================================
 

diff --git a/GooseHDF5/cli/G5repair.py b/GooseHDF5/cli/G5repair.py
@@ -28,11 +28,11 @@
 import re
 import h5py
 import docopt
-import pkg_resources
 
-__version__ = pkg_resources.require("GooseHDF5")[0].version
-
-from .. import *
+from .. import __version__
+from .. import verify
+from .. import copydatasets
+from .. import getdatasets
 
 # ==================================================================================================
 

diff --git a/setup.py b/setup.py
@@ -2,9 +2,14 @@
 from setuptools import setup
 from setuptools import find_packages
 
+import re
+
+filepath = 'GooseHDF5/__init__.py'
+__version__ = re.findall(r'__version__ = \'(.*)\'', open(filepath).read())[0]
+
 setup(
      name = 'GooseHDF5',
-     version = '0.1.1',
+     version = __version__,
      license = 'MIT',
      author = 'Tom de Geus',
      author_email = 'tom@geus.me',