From 7b1ddab5199432c1aabc371a34ec42dd386dfa6f Mon Sep 17 00:00:00 2001 From: Claus Wilke Date: Thu, 1 Nov 2018 14:47:38 -0500 Subject: [PATCH] This commit changes the license to MIT, as agreed by all contributors to the software (see https://github.com/mtien/PeptideBuilder/issues/9). To indicate this change, the minor version number has been increased to 1.0.4. Closes issue #9. --- LICENSE | 7 +++++++ PeptideBuilder/Geometry.py | 3 +-- PeptideBuilder/PeptideBuilder.py | 3 +-- PeptideBuilder/__init__.py | 2 +- README.txt => README.md | 6 +++--- setup.py | 4 ++-- 6 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 LICENSE rename README.txt => README.md (87%) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d6f0a93 --- /dev/null +++ b/LICENSE @@ -0,0 +1,7 @@ +Copyright 2018 Tien, Sydykova, Meyer, Wilke + +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. \ No newline at end of file diff --git a/PeptideBuilder/Geometry.py b/PeptideBuilder/Geometry.py index 07bfe5f..0443c9f 100644 --- a/PeptideBuilder/Geometry.py +++ b/PeptideBuilder/Geometry.py @@ -7,8 +7,7 @@ geometry() function, which returns the default geometry for the requested amino acid. -This file is provided to you under the GNU General Public -License, version 2.0 or later.''' +This file is provided to you under the MIT License.''' from __future__ import print_function import random diff --git a/PeptideBuilder/PeptideBuilder.py b/PeptideBuilder/PeptideBuilder.py index 65a6a3e..aba2f33 100644 --- a/PeptideBuilder/PeptideBuilder.py +++ b/PeptideBuilder/PeptideBuilder.py @@ -10,8 +10,7 @@ This module also requires the Bio.PDB module from Biopython, for structure manipulation. -This file is provided to you under the GNU General Public -License, version 2.0 or later.''' +This file is provided to you under the MIT License.''' from __future__ import print_function from Bio.PDB import * diff --git a/PeptideBuilder/__init__.py b/PeptideBuilder/__init__.py index 566ca4f..9e1bc8f 100644 --- a/PeptideBuilder/__init__.py +++ b/PeptideBuilder/__init__.py @@ -6,6 +6,6 @@ * PeptideBuilder * Geometry """ -__version__ = '1.0.3' +__version__ = '1.0.4' from .PeptideBuilder import * from .Geometry import * diff --git a/README.txt b/README.md similarity index 87% rename from README.txt rename to README.md index b17ae2d..fb80e81 100644 --- a/README.txt +++ b/README.md @@ -5,9 +5,9 @@ Reference: M. Z. Tien, D. K. Sydykova, A. G. Meyer, C. O. Wilke (2013). PeptideBuilder: A simple Python library to generate model peptides. PeerJ 1:e80. -The software is provided to you under the GNU General Public -License, version 2.0 or later. The most up-to-date version of this software is -available at https://github.com/mtien/PeptideBuilder. +The software is provided to you under the MIT license (see file LICENSE). +The most up-to-date version of this software is available at +https://github.com/mtien/PeptideBuilder. The files 'Geometry.py' and 'PeptideBuilder.py' constitute the PeptideBuilder library. They need to be placed into the search path of your python diff --git a/setup.py b/setup.py index cfbb6f9..3e5d88f 100644 --- a/setup.py +++ b/setup.py @@ -21,12 +21,12 @@ from setuptools import setup setup(name = 'PeptideBuilder', - version = '1.0.3', + version = '1.0.4', description = 'Tools to create peptide PDB files using geometry as input', author = 'Matthew Z. Tien', author_email = 'Matthew.Tien89@gmail.com', url = 'https://github.com/mtien/PeptideBuilder', - download_url = 'https://github.com/mtien/PeptideBuilder/archive/v1.0.2.tar.gz', + download_url = 'https://github.com/mtien/PeptideBuilder/archive/v1.0.4.tar.gz', platforms = 'Tested on Mac OS X.', packages = ['PeptideBuilder'], install_requires=['Biopython']