Merge pull request #17 from mattmakesmaps/development

Release 0.2.1

Author: mattmakesmaps

CHANGES.txt

@@ -1 +1,16 @@
-v<version>, <date> -- Initial release.
+=======
+CHANGES
+=======
+
+Release 0.2.1
+-------------
+
+* Convert to setuptools build process.
+* Converted pgsql2gist.py script to pgsql2gist entry point.
+* Added nosetests to setup.py.
+* Added keywords and classifiers to setup.py.
+
+Release 0.2.0
+-------------
+
+* Initial Release as PyPi package.

README.txt

@@ -16,6 +16,8 @@ See issues for additional features to be implemented.
 Current Usage / Caveats
 =======================
 
+Listed below is the --help usage information.::
+
     POST GeoJSON or TopoJSON features from PostGIS to a Github Gist.
 
     Example usage: python pgsql2gist.py --host localhost --user matt tilestache \

pgsql2gist/__init__.py

@@ -1,5 +1,6 @@
 __author__ = 'matt'
 __date__ = '11/24/13'
+
 # From each module, add the relevant class into the pgsql2gist package namespace.
 from .gisthandler import GistAPIHandler
 from .pgconn import PostGISConnection

pgsql2gist.py renamed to pgsql2gist/command_line.py

@@ -1,6 +1,6 @@
-__author__ = 'matt'
+#! /usr/bin/env python
+__author__ = 'Matthew Kenny'
 __date__ = '11/19/13'
-__version__ = '0.1'
 """
 POST GeoJSON or TopoJSON features from PostGIS to a Github Gist.
 
@@ -38,13 +38,11 @@
 
 # Import relevant modules from the pgsql2gist package.
 import time
-
 from psycopg2 import Error
-
 from pgsql2gist import GistAPIHandler, PostGISConnection, CLIInterface, GeoJSONConstructor
 
 
-if __name__ == '__main__':
+def main():
     try:
         # Setup CLI; Parse User Input
         arg_parse = CLIInterface()
@@ -57,7 +55,7 @@
             except Error as e:
                 print "PostGIS SQL Execution Error: ", e.message
                 raise e
-            # Get results
+                # Get results
             query_results = db.fetchall()
 
         # Create GeoJSON Feature Collection
@@ -80,3 +78,7 @@
             print "ERROR: ", e.message
         print 'Terminating Script'
         raise SystemExit
+
+
+if __name__ == '__main__':
+    main()

pgsql2gist/tests/__init__.py

@@ -0,0 +1,2 @@
+__author__ = 'matt'
+__date__ = '12/7/13'

tests/test_cli.py renamed to pgsql2gist/tests/test_cli.py

@@ -1,15 +1,27 @@
-from distutils.core import setup
+from setuptools import setup
 
 setup(
-    name='Pgsql2Gist',
-    version='0.2.0',
+    name='pgsql2gist',
+    version='0.2.1',
     author='Matthew Kenny',
     author_email='matthewkenny AT gmail DOT com',
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Topic :: Scientific/Engineering :: GIS',
+        'License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)',
+        'Intended Audience :: Developers'
+    ],
     packages=['pgsql2gist'],
-    scripts=['pgsql2gist.py'],
+    entry_points = {
+        'console_scripts': ['pgsql2gist=pgsql2gist.command_line:main'],
+    },
     url='https://github.com/mattmakesmaps/pgsql2gist',
     license='GNU LESSER GENERAL PUBLIC LICENSE',
+    keywords='gis gists postgis postgresql geojson',
     description='like pgsql2shp, but for github gists',
     long_description=open('README.txt').read(),
-    install_requires=['psycopg2']
+    install_requires=['psycopg2'],
+    test_suite='nose.collector',
+    tests_require=['nose', 'nose-cover3'],
+    include_package_data=True
 )