fix entry_points in setup

HDFGroup · Dec 14, 2017 · c761bae · c761bae
1 parent 5d44649
commit c761bae
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 13 deletions.
diff --git a/h5json/h5tojson/__init__.py b/h5json/h5tojson/__init__.py
@@ -0,0 +1,13 @@
+##############################################################################
+# Copyright by The HDF Group.                                                #
+# All rights reserved.                                                       #
+#                                                                            #
+# This file is part of H5Serv (HDF5 REST Server) Service, Libraries and      #
+# Utilities.  The full HDF5 REST Server copyright notice, including          #
+# terms governing use, modification, and redistribution, is contained in     #
+# the file COPYING, which can be found at the root of the source code        #
+# distribution tree.  If you do not have access to this file, you may        #
+# request a copy from [email protected].                                     #
+##############################################################################
+
+from __future__ import absolute_import
diff --git a/h5tojson/h5tojson.py → h5json/h5tojson/h5tojson.py b/h5tojson/h5tojson.py → h5json/h5tojson/h5tojson.py
@@ -244,4 +244,5 @@ def main():
         dumper.dumpFile()
 
 
-main()
+if __name__ == "__main__":
+    main()
diff --git a/h5json/jsontoh5/__init__.py b/h5json/jsontoh5/__init__.py
@@ -0,0 +1,13 @@
+##############################################################################
+# Copyright by The HDF Group.                                                #
+# All rights reserved.                                                       #
+#                                                                            #
+# This file is part of H5Serv (HDF5 REST Server) Service, Libraries and      #
+# Utilities.  The full HDF5 REST Server copyright notice, including          #
+# terms governing use, modification, and redistribution, is contained in     #
+# the file COPYING, which can be found at the root of the source code        #
+# distribution tree.  If you do not have access to this file, you may        #
+# request a copy from [email protected].                                     #
+##############################################################################
+
+from __future__ import absolute_import
diff --git a/jsontoh5/jsontoh5.py → h5json/jsontoh5/jsontoh5.py b/jsontoh5/jsontoh5.py → h5json/jsontoh5/jsontoh5.py
@@ -233,7 +233,6 @@ def writeFile(self):
         self.createLinks()      # link it all together
 
 def main():
-
     parser = argparse.ArgumentParser(usage='%(prog)s [-h] <json_file> <h5_file>')
     parser.add_argument('in_filename', nargs='+', help='JSon file to be converted to h5')
     parser.add_argument('out_filename', nargs='+', help='name of HDF5 output file')
@@ -276,5 +275,5 @@ def main():
 
     print("done!")
 
-
-main()
+if __name__ == "__main__":
+    main()
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 """
 
 # Always prefer setuptools over distutils
-from setuptools import setup, find_packages
+from setuptools import setup
 # To use a consistent encoding
 from codecs import open
 from os import path
@@ -23,7 +23,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.1.1',
+    version='1.1.2',
 
     description='HDF5/JSON Tools',
     long_description=long_description,
@@ -62,14 +62,16 @@
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6'
     ],
 
     # What does your project relate to?
     keywords='json hdf5 numpy array data',
 
     # You can just specify the packages manually here if your project is
     # simple. Or you can use find_packages().
-    packages=find_packages(exclude=['docs', 'test*']),
+    #packages=find_packages(exclude=['docs', 'test*']),
+    packages=['h5json','h5json.h5tojson','h5json.jsontoh5'],
 
     # Alternatively, if you want to distribute just a my_module.py, uncomment
     # this:
@@ -80,6 +82,8 @@
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
     install_requires=['numpy>=1.10.4', 'h5py>=2.5'],
+    setup_requires=['pkgconfig', 'six'],
+    zip_safe=False,
 
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,
@@ -106,10 +110,8 @@
     # To provide executable scripts, use entry points in preference to the
     # "scripts" keyword. Entry points provide cross-platform support and allow
     # pip to create the appropriate form of executable for the target platform.
-    #entry_points={
-    #    'console_scripts': [
-    #        'h5tojson=h5tojson:h5tojson', 'jsontoh5=jsontoh5:jsontoh5',
-    #    ],
-    #},
-    scripts=['h5tojson/h5tojson.py', 'jsontoh5/jsontoh5.py'],
+    entry_points={'console_scripts':
+          ['h5tojson = h5json.h5tojson.h5tojson:main', 
+           'jsontoh5 = h5json.jsontoh5.jsontoh5:main' 
+          ]},
 )