Merge branch 'codysoyland/master'

LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) Ask Solem Hoel and individual contributors.
+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.
+
+    3. Neither the name of python-github2 nor the names of its contributors may be used
+       to endorse or promote products derived from this software without
+       specific prior written permission.
+
+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.

MANIFEST.in

@@ -1,3 +1,4 @@
 recursive-include examples *
 include README.rst
 include AUTHORS
+include LICENSE

README.rst

@@ -26,11 +26,11 @@ or from source.
 
 To install using ``pip``,::
 
-    $ pip install python-github2
+    $ pip install github2
 
 To install using ``easy_install``,::
 
-    $ easy_install python-github2
+    $ easy_install github2
 
 If you have downloaded a source tarball you can install it
 by doing the following,::

setup.py

@@ -18,6 +18,7 @@ setup(
     author=github2.__author__,
     author_email=github2.__contact__,
     url=github2.__homepage__,
+    license='BSD',
     platforms=["any"],
     packages=find_packages(exclude=['ez_setup']),
     scripts=['github2/bin/github_manage_collaborators'],
@@ -27,6 +28,7 @@ setup(
         "Development Status :: 3 - Alpha",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
+        "License :: OSI Approved :: BSD License",
     ],
     long_description=codecs.open('README.rst', "r", "utf-8").read(),
 )