From 932d29a1ab98a9bda00ae804a06f8a8dc1d40fdc Mon Sep 17 00:00:00 2001 From: Ryan McGrath Date: Tue, 28 Jul 2009 23:22:52 -0400 Subject: [PATCH] Changed licensing, modified contents of setup.py to conform to what Pypi wants/needs --- LICENSE | 25 +++++++++++++++++-------- README | 2 +- setup.py | 6 +++--- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/LICENSE b/LICENSE index 03c5461..6fdab59 100644 --- a/LICENSE +++ b/LICENSE @@ -1,12 +1,21 @@ -Tango is released under the "Tango License". +The MIT License -What's the "Tango License"? It basically means you can do -whatever you want with this; hack on it, redistribute it, contribute changes, whatever. +Copyright (c) 2009 Ryan McGrath -All I ask is that, if you do make changes to Tango, decide to fork it, etc., please provide some -note about the origin of the work. (i.e, a link back to Tango, etc) +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -Tango is provided "as-is"; that is, I don't guarantee that it will 100% work in your -environment without some effort. Tango is a base to build off of. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -~ Ryan McGrath, 07/27/2009 +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/README b/README index bf8aad1..7eb7671 100644 --- a/README +++ b/README @@ -45,4 +45,4 @@ My hope is that Tango is so simple that you'd never *have* to ask any questions, you feel the need to contact me for this (or other) reasons, you can hit me up at ryan@venodesigns.net. -Tango is released under the "Tango License" - see the LICENSE file for more information. +Tango is released under an MIT License - see the LICENSE file for more information. diff --git a/setup.py b/setup.py index 449e678..f5b217b 100644 --- a/setup.py +++ b/setup.py @@ -25,10 +25,10 @@ SETUPTOOLS_METADATA = dict( classifiers = [ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', - 'License :: Tango License', + 'License :: OSI Approved :: MIT License', 'Topic :: Software Development :: Libraries :: Python Modules', - 'Topic :: Communications :: Chat :: Twitter', - 'Topic :: Internet :: Search', + 'Topic :: Communications :: Chat', + 'Topic :: Internet', ] )