Cleaned up setup and readme

Author: 4b796c65

LICENSE.txt

@@ -0,0 +1,26 @@
+Copyright (c) 2012-2014, Kyle Stewart
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met: 
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the FreeBSD Project.

README.txt

@@ -1,39 +1,29 @@
-=== Requirements ===
-* Python 2.6+ or 3.x
+=======
+ About
+=======
+TDL is a port of the C library libtcod in an attempt to make it more "Pythonic"
+
+The library can be used for displaying tilesets (ANSI, Unicode, or graphical) in true color.
+
+It also provides functionality to compute path-finding and field of view.
+
+python-tdl on GoogleCode: http://code.google.com/p/python-tdl/
+
+Online Documentation: http://pythonhosted.org/tdl/
+
+Issue Tracker: http://code.google.com/p/python-tdl/issues/list
+
+python-tdl is a ctypes port of "libtcod".
+You can find more about libtcod at: http://doryen.eptalys.net/libtcod/
+
+==============
+ Requirements
+==============
+* Python 2.6+ or 3.x up to 3.3
 * 32 bit Windows, 32/64 bit Linux, or Mac OS/X (64 bit architecture)
 
-=== About ===
-TDL is a port of the C library libtcod in an attempt to make it more "Pythonic"
-You can find more about libtcod at: http://doryen.eptalys.net/libtcod/
-And you can find the tdl project here: http://code.google.com/p/python-tdl/
-
-Report any bugs or issues here:
-https://code.google.com/p/python-tdl/issues/list
-
-== License ==
-Copyright (c) 2012, Kyle Stewart
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met: 
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer. 
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The views and conclusions contained in the software and documentation are those
-of the authors and should not be interpreted as representing official policies, 
-either expressed or implied, of the FreeBSD Project.
+=========
+ License
+=========
+python-tdl is distributed under the FreeBSD license, same as libtcod.
+Read LICENSE.txt for more details.

setup.py

@@ -22,7 +22,7 @@ def get_version():
         if ':' in revision:
             revision = revision.split(':')[-1]
         if 'M' in revision:
-            revision = revision[:-1]
+            revision = str(int(revision[:-1]) + 1)
         file = open('tdl/VERSION.txt', 'w')
         file.write(base_version + 'r' + revision)
         file.close()
@@ -38,23 +38,13 @@ def get_version():
       author='Kyle Stewart',
       author_email='4B796C65+pythonTDL@gmail.com',
       description='Pythonic port of rogue-like library libtcod.',
-      long_description="""python-tdl is a ctypes port of "libtcod".
-
-      The library is used for displaying tilesets (ANSI, Unicode, or graphical) in true color.
-      
-      It also provides functionality to compute path-finding and field of view.
-      
-      python-tdl on GoogleCode: http://code.google.com/p/python-tdl/
-      Online Documentation: http://pythonhosted.org/tdl/
-      Issue Tracker: http://code.google.com/p/python-tdl/issues/list
-      
-      libtcod: http://doryen.eptalys.net/libtcod/
-      """,
+      long_description=open('README.txt', 'r').read(),
       url='http://code.google.com/p/python-tdl/',
-      download_url='http://code.google.com/p/python-tdl/downloads/list',
+      download_url='https://pypi.python.org/pypi/tdl',
       packages=['tdl'],
-      package_data={'tdl': ['lib/*.txt', '*.bmp', '*.png', 'lib/win32/*',
+      package_data={'tdl': ['*.txt', 'lib/*.txt', '*.bmp', '*.png', 'lib/win32/*',
                             'lib/darwin/*.dylib', 'lib/linux*/*']},
+      install_requires=['ctypes'],
       classifiers=['Development Status :: 5 - Production/Stable',
                    'Environment :: Win32 (MS Windows)',
                    'Environment :: MacOS X',
@@ -68,12 +58,17 @@ def get_version():
                    'Programming Language :: Python :: 2.6',
                    'Programming Language :: Python :: 2.7',
                    'Programming Language :: Python :: 3',
+                   'Programming Language :: Python :: 3.0',
+                   'Programming Language :: Python :: 3.1',
+                   'Programming Language :: Python :: 3.2',
+                   'Programming Language :: Python :: 3.3',
+                   'Programming Language :: Python :: Implementation :: CPython',
                    'Programming Language :: Python :: Implementation :: PyPy',
                    'Topic :: Games/Entertainment',
                    'Topic :: Multimedia :: Graphics',
                    'Topic :: Software Development :: Libraries :: Python Modules',
                    ],
-      keywords = 'portable rogue-like rogue-likes text ctypes ASCII ANSI Unicode libtcod fov pathfinsing',
+      keywords = 'portable rogue-like rogue-likes text ctypes ASCII ANSI Unicode libtcod fov',
       platforms = ['Windows', 'Mac OS X', 'Linux'],
       license = 'New BSD License'
       )

tdl/VERSION.txt

@@ -1 +1 @@
-1.1.6r79
+1.1.6r81