Skip to content

Commit 4586465

Browse files
committed
Migrate license from BSD -> MIT, fixes #46
1 parent 928ecc1 commit 4586465

File tree

5 files changed

+22
-28
lines changed

5 files changed

+22
-28
lines changed

LICENSE

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
1-
Copyright (c) 2016-2018, Tony Narlock
2-
All rights reserved.
1+
MIT License
32

4-
Redistribution and use in source and binary forms, with or without
5-
modification, are permitted provided that the following conditions are met:
3+
Copyright (c) 2016-2018 libtmux contributors
64

7-
* Redistributions of source code must retain the above copyright notice, this
8-
list of conditions and the following disclaimer.
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
911

10-
* Redistributions in binary form must reproduce the above copyright notice,
11-
this list of conditions and the following disclaimer in the documentation
12-
and/or other materials provided with the distribution.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
1314

14-
* Neither the name of libtmux nor the names of its
15-
contributors may be used to endorse or promote products derived from
16-
this software without specific prior written permission.
17-
18-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ powerful traversal features::
155155
>>> pane.window.session
156156
Session($3 foo)
157157

158-
.. _BSD: http://opensource.org/licenses/BSD-3-Clause
158+
.. _MIT: http://opensource.org/licenses/MIT
159159
.. _developing and testing: http://libtmux.git-pull.com/en/latest/developing.html
160160
.. _tmuxp: https://tmuxp.git-pull.com/
161161
.. _documentation: https://libtmux.git-pull.com/
@@ -189,7 +189,7 @@ Travis http://travis-ci.org/tmux-python/libtmux
189189
Test Coverage https://codecov.io/gh/tmux-python/libtmux
190190
pypi https://pypi.python.org/pypi/libtmux
191191
Open Hub https://www.openhub.net/p/libtmux-python
192-
License `BSD`_.
192+
License `MIT`_.
193193
git repo .. code-block:: bash
194194

195195
$ git clone https://github.com/tmux-python/libtmux.git

libtmux/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
__description__ = 'scripting library / orm for tmux'
55
__email__ = 'tony@git-pull.com'
66
__author__ = 'Tony Narlock'
7-
__license__ = 'BSD'
7+
__license__ = 'MIT'
88
__copyright__ = 'Copyright 2016-2018 Tony Narlock'

libtmux/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
~~~~~~~
77
88
:copyright: Copyright 2016-2018 Tony Narlock.
9-
:license: BSD, see LICENSE for details
9+
:license: MIT, see LICENSE for details
1010
1111
"""
1212

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def run_tests(self):
5757
keywords=about['__title__'],
5858
classifiers=[
5959
'Development Status :: 5 - Production/Stable',
60-
"License :: OSI Approved :: BSD License",
60+
"License :: OSI Approved :: MIT License",
6161
"Operating System :: POSIX",
6262
"Operating System :: MacOS :: MacOS X",
6363
'Environment :: Web Environment',

0 commit comments

Comments
 (0)