Switch to MIT license; prepare for 1.06 PyPi release

kirsle · kirsle · commit cc3808244151 · 2014-11-25T18:53:51.000-08:00
diff --git a/Changes b/Changes
@@ -1,5 +1,21 @@
 Revision history for the Python package RiveScript.
 
+1.06  Nov 25 2014
+	- Change package name from python-rivescript to simply rivescript.
+	- Change from the GPLv2 license to the MIT license.
+	- Add compatibility with Python 3.
+	- Add Unicode support for RiveScript documents.
+	- Prefer the .rive extension for RS documents over the old .rs extension.
+	- Track filenames and line numbers when parsing RiveScript documents.
+	- Add Perl object handler example.
+	- Add current_user() method accessible from inside an object macro.
+	- Add unit tests.
+	- Add deparse() function that dumps the active memory state of the bot.
+	- Add write() method that writes the active memory state back to disk as a
+	  .rive file (uses deparse()).
+	- Bugfix with substitution placeholders.
+	- Bugfix with the <input> and <reply> tags.
+
 1.01  May 20 2013
 	- Small bugfix in _rot13 that caused crashes under certain circumstances.
 	- Small bugfix regarding the {weight} tag and atomic triggers.
diff --git a/LICENSE b/LICENSE
diff --git a/rivescript/__init__.py b/rivescript/__init__.py
@@ -1,6 +1,29 @@
 #!/usr/bin/env python
+
 # pyRiveScript - A RiveScript interpreter written in Python.
 
+# The MIT License (MIT)
+#
+# Copyright (c) 2014 Noah Petherbridge
+#
+# 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:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# 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.
+
 # Python 3 compat
 from __future__ import print_function
 
@@ -10,12 +33,12 @@
     'Noah Petherbridge',
     'dinever'
 ]
-__license__    = 'GPL'
+__license__    = 'MIT'
 __maintainer__ = 'Noah Petherbridge'
 __status__     = 'Production'
 __docformat__  = 'plaintext'
 
 __all__      = ['rivescript']
-__version__  = '1.05'
+__version__  = '1.06'
 
 from .rivescript import RiveScript
diff --git a/rivescript/__main__.py b/rivescript/__main__.py
@@ -1,5 +1,27 @@
 #!/usr/bin/env python
 
+# The MIT License (MIT)
+#
+# Copyright (c) 2014 Noah Petherbridge
+#
+# 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:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# 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.
+
 from __future__ import absolute_import
 
 """RiveScript's __main__.py
diff --git a/rivescript/interactive.py b/rivescript/interactive.py
@@ -1,5 +1,27 @@
 #!/usr/bin/env python
 
+# The MIT License (MIT)
+#
+# Copyright (c) 2014 Noah Petherbridge
+#
+# 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:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# 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.
+
 from __future__ import print_function
 
 """interactive.py: RiveScript's built-in interactive mode.
diff --git a/rivescript/python.py b/rivescript/python.py
@@ -1,5 +1,27 @@
 #!/usr/bin/env python
 
+# The MIT License (MIT)
+#
+# Copyright (c) 2014 Noah Petherbridge
+#
+# 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:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# 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.
+
 # Python3 compat
 from __future__ import print_function
 
diff --git a/rivescript/rivescript.py b/rivescript/rivescript.py
@@ -1,8 +1,29 @@
 #!/usr/bin/env python
 
+# The MIT License (MIT)
+#
+# Copyright (c) 2014 Noah Petherbridge
+#
+# 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:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# 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.
+
 import sys
 import os
-import glob
 import re
 import string
 import random
diff --git a/setup.cfg b/setup.cfg
@@ -7,3 +7,4 @@ doc_files = README.md
 			docs/
 			eg/
 			example.py
+			example3.py
diff --git a/setup.py b/setup.py
@@ -4,18 +4,19 @@
 from setuptools import setup
 
 setup(
-    name             = 'python-rivescript',
+    name             = 'rivescript',
     version          = rivescript.__version__,
     description      = 'A Chatterbot Scripting Language',
     long_description = 'A scripting language to make it easy to write responses for a chatterbot.',
     author           = 'Noah Petherbridge',
     author_email     = 'root@kirsle.net',
     url              = 'https://github.com/kirsle/rivescript-python',
-    license          = 'Dual licensed; GPLv2',
+    license          = 'MIT',
     packages         = ['rivescript'],
-    keywords         = 'bot chatbot chatterbot ai aiml chatscript buddyscript',
+    keywords         = ['bot', 'chatbot', 'chatterbot', 'ai', 'aiml',
+                        'chatscript', 'buddyscript'],
     classifiers      = [
-        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
