diff --git a/CHANGES.rst b/CHANGES.rst index 73a876f..e611517 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,45 +1,42 @@ -========== Change Log ========== ------------------ +1.0.14 +------ + +* Re-licensed under BSD. + 1.0.12 and 1.0.13 ----------------- * Forget that these ever existed. ------- 1.0.11 ------ * Bug fix of a bug fix for regions config. (jcartmell) ------- 1.0.10 ------ * Bug fix regarding regions and when they are sent. (jcartmell) ------ 1.0.9 ----- * Various fixes to RateRequest() FedEx API call. (jcartmell) * Added this changelog. (gtaylor) ------ 1.0.8 ----- * Fixed some problems with the unit tests. (gtaylor) ------ 1.0.7 ----- * Fixed a bug with international rate request example. (gtaylor) ------ 1.0.6 ----- @@ -47,14 +44,12 @@ Change Log * FedEx RateRequest call implemented. (yahtib) * FedEx Postal Inquiry call implemented. (yahtib) ------ 1.0.4 ----- * Removal of unecessary files. (gtaylor) * Documentation improvements. (gtaylor) ------ 1.0.3 ----- diff --git a/MANIFEST.in b/MANIFEST.in index 9bae6c6..feb9b2a 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,5 @@ -LICENSE.txt +include LICENSE.txt +include README.rst recursive-include examples *.txt *.py recursive-include docs * recursive-include fedex/wsdl * \ No newline at end of file diff --git a/setup.py b/setup.py index 1397afb..e1df69b 100755 --- a/setup.py +++ b/setup.py @@ -1,21 +1,4 @@ #!/usr/bin/env python -""" - python-fedex - Copyright (C) 2009 Gregory Taylor - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -""" from distutils.core import setup import fedex @@ -45,7 +28,7 @@ package_dir={'fedex': 'fedex'}, package_data={'fedex': ['wsdl/*.wsdl', 'wsdl/test_server_wsdl/*.wsdl']}, platforms=['Platform Independent'], - license='GPLv3', + license='BSD', classifiers=CLASSIFIERS, keywords=KEYWORDS, requires=['suds'],