From 72b095e7e5fdd5125e3a0cc618e3fc186341a3f6 Mon Sep 17 00:00:00 2001
From: Jianfeng <ginfungchan@gmail.com>
Date: Sat, 14 Jan 2017 17:29:18 -0500
Subject: [PATCH] update

---
 lace/cli.py |   1 +
 setup.py    | 130 +++++++++++++++++++++++++++++++++-------------------
 2 files changed, 83 insertions(+), 48 deletions(-)

diff --git a/lace/cli.py b/lace/cli.py
index fe48c0d..fade057 100644
--- a/lace/cli.py
+++ b/lace/cli.py
@@ -6,3 +6,4 @@ def cli():
 
 if __name__ == '__main__':
     cli()
+
diff --git a/setup.py b/setup.py
index a4937b2..eb6ef31 100755
--- a/setup.py
+++ b/setup.py
@@ -1,18 +1,79 @@
-"""A setuptools based setup module for LACE"""
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+# """A setuptools based setup module for LACE"""
+# #!/usr/bin/env python
+# # -*- coding: utf-8 -*-
 
+# from codecs import open
+# from os import path
+# from setuptools import setup, find_packages
+
+# import versioneer, sys
+
+# here = path.abspath(path.dirname(__file__))
+
+# with open(path.join(here, 'README.rst'), encoding='utf-8') as readme_file:
+#     readme = readme_file.read()
+
+# with open(path.join(here, 'HISTORY.rst'), encoding='utf-8') as history_file:
+#     history = history_file.read().replace('.. :changelog:', '')
+
+# requirements = [
+#     'click',
+#     'numpy'
+# ]
+
+# test_requirements = [
+# ]
+
+# # The source dist comes with batteries included, the wheel can use pip to get the rest
+# is_wheel = 'bdist_wheel' in sys.argv
+
+# excluded = []
+# if is_wheel:
+#     excluded.append('extlibs.future')
+
+
+# setup(
+#     name='lace',
+#     # version=versioneer.get_version(),
+#     # cmdclass=versioneer.get_cmdclass(),
+#     version = '1.0.1',
+
+#     description=" Lace-scale Assurance of Confidentiality Environment",
+#     long_description=readme + '\n\n' + history,
+#     author="Jianfeng Chen",
+#     author_email='jchen37@ncsu.edu',
+#     url='https://github.com/ginfung/LACE',
+    
+#     packages=find_packages(exclude=['contrib', 'docs', 'tests']),
+#     entry_points={
+#         'console_scripts':[
+#             'LACE=lace.cli:',
+#             ],
+#         },
+#     # scripts=['lace/'],
+#     # include_package_data=True,
+#     install_requires=requirements,
+#     license="MIT",
+#     classifiers=[
+#         'Development Status :: 4 - Beta',
+#         'Topic :: Database', 
+#         'Intended Audience :: Developers',
+#         'License :: OSI Approved :: MIT License',
+#         'Natural Language :: English',
+#         "Programming Language :: Python :: 2",
+#         'Programming Language :: Python :: 2.7',
+#     ],
+#     test_suite='tests',
+#     tests_require=test_requirements,
+# )
+
+from distutils.core import setup
 from codecs import open
 from os import path
-from setuptools import setup, find_packages
-
-import versioneer, sys
 
 here = path.abspath(path.dirname(__file__))
-
 with open(path.join(here, 'README.rst'), encoding='utf-8') as readme_file:
     readme = readme_file.read()
-
 with open(path.join(here, 'HISTORY.rst'), encoding='utf-8') as history_file:
     history = history_file.read().replace('.. :changelog:', '')
 
@@ -21,48 +82,21 @@
     'numpy'
 ]
 
-test_requirements = [
-]
+setup(
+    name = 'lace',
+    version = '1.0.1',
 
-# The source dist comes with batteries included, the wheel can use pip to get the rest
-is_wheel = 'bdist_wheel' in sys.argv
+    author = 'Jianfeng Chen',
+    author_email = 'jchen37@ncsu.edu',
+    url = 'https://github.com/ginfung/lace',
 
-excluded = []
-if is_wheel:
-    excluded.append('extlibs.future')
+    description = 'Lace-scale Assurance of Confidentiality Environment Framework',
+    long_description=readme + '\n\n' + history,
 
+    packages = ['lace'],
+    include_package_data = True,
 
-setup(
-    name='lace',
-    # version=versioneer.get_version(),
-    # cmdclass=versioneer.get_cmdclass(),
-    version = '1.0.1',
+    license= 'MIT',
 
-    description=" Lace-scale Assurance of Confidentiality Environment",
-    long_description=readme + '\n\n' + history,
-    author="Jianfeng Chen",
-    author_email='jchen37@ncsu.edu',
-    url='https://github.com/ginfung/LACE',
-    
-    packages=find_packages(exclude=['contrib', 'docs', 'tests']),
-    # entry_points={
-    #     'console_scripts':[
-    #         'LACE=lace.cli:cli',
-    #         ],
-    #     },
-    scripts=['lace/'],
-    # include_package_data=True,
-    install_requires=requirements,
-    license="MIT",
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Topic :: Database', 
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Natural Language :: English',
-        "Programming Language :: Python :: 2",
-        'Programming Language :: Python :: 2.7',
-    ],
-    test_suite='tests',
-    tests_require=test_requirements,
-)
+    install_requires = requirements
+    )
\ No newline at end of file