Skip to content

Commit bbb42b5

Browse files
committed
change license from GPL to BSD, add LICENSE.txt, revise setup.py and www/index.html
1 parent 0059069 commit bbb42b5

File tree

3 files changed

+35
-6
lines changed

3 files changed

+35
-6
lines changed

LICENSE.txt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Copyright (c) 2009, 2010, 2011 Jonathan Jacky
2+
3+
All rights reserved.
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions are met:
7+
8+
a. Redistributions of source code must retain the above copyright notice,
9+
this list of conditions and the following disclaimer.
10+
b. Redistributions in binary form must reproduce the above copyright
11+
notice, this list of conditions and the following disclaimer in the
12+
documentation and/or other materials provided with the distribution.
13+
c. Neither the name of the PyModel nor the names of its contributors
14+
may be used to endorse or promote products derived from this software
15+
without specific prior written permission.
16+
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
21+
ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
22+
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
26+
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27+
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
28+
DAMAGE.

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
description = 'Model-based testing in Python',
3434
long_description = open('README.rst').read(),
3535
download_url = 'http://staff.washington.edu/jon/pymodel/www/',
36-
license = 'GNU General Public License (GPL)',
36+
license = 'BSD License',
3737

3838
keywords = 'model-based testing python model on-the-fly offline composition finite state machine harness stepper automated test run suite oracle nondeterminism synchronizing interleaving strategy coverage protocol trace scenario',
3939

@@ -42,7 +42,7 @@
4242
'Development Status :: 4 - Beta',
4343
'Environment :: Console',
4444
'Intended Audience :: Developers',
45-
'License :: OSI Approved :: GNU General Public License (GPL)',
45+
'License :: OSI Approved :: BSD License',
4646
'Natural Language :: English',
4747
'Operating System :: OS Independent',
4848
'Operating System :: Microsoft :: Windows',

www/index.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ <h2>PyModel: Model-based testing in Python</h2>
6262
the <a href="../samples">samples</a>.
6363

6464
<p>
65-
Here are the <a href="../talks/pymodel-nwpd10.pdf">slides</a> for a
66-
talk on PyModel at <a href="http://www.seapig.org/NWPD10">NWPD10</a>.
65+
Here are the <a href="../talks/pymodel-nwpd10.pdf">slides</a> for
66+
talks on PyModel given at <a href="http://www.seapig.org/NWPD10">NWPD10</a>
67+
and <a href="http://conference.scipy.org/scipy2011/schedule.php">SciPy 2011</a>.
6768

6869
<p>
6970
You may download <a href="PyModel-0.9.tar.gz">PyModel-0.9.tar.gz</a> or
@@ -84,8 +85,8 @@ <h2>PyModel: Model-based testing in Python</h2>
8485

8586
<p>
8687
PyModel is covered by the
87-
<a href="http://www.gnu.org/copyleft/gpl.html">
88-
GNU General Public License (GPL)</a>.
88+
<a href="http://www.opensource.org/licenses/BSD-3-Clause">
89+
BSD License</a>.
8990
Code and documents are copyright (C) 2009, 2010, 2011 Jonathan Jacky.
9091

9192
<hr>

0 commit comments

Comments
 (0)