* use the MIT license for the py lib
* bump version to prospective 1.1.0b1 * strike some unused code from initpkg --HG-- branch : trunk
This commit is contained in:
holger krekel
parent
1f29529a24
commit
db1ff48996
12
AUTHORS
12
AUTHORS
|
|
@ -8,3 +8,15 @@ Armin Rigo, arigo at tunes org
|
||||||
Maciek Fijalkowski, fijal at genesilico pl
|
Maciek Fijalkowski, fijal at genesilico pl
|
||||||
Brian Dorsey, briandorsey at gmail com
|
Brian Dorsey, briandorsey at gmail com
|
||||||
merlinux GmbH, Germany, office at merlinux eu
|
merlinux GmbH, Germany, office at merlinux eu
|
||||||
|
|
||||||
|
Contributors include::
|
||||||
|
|
||||||
|
Chris Lamb
|
||||||
|
Harald Armin Massa
|
||||||
|
Ralf Schmitt
|
||||||
|
Martijn Faassen
|
||||||
|
Ian Bicking
|
||||||
|
Jan Balster
|
||||||
|
Grig Gheorghiu
|
||||||
|
Bob Ippolito
|
||||||
|
Christian Tismer
|
||||||
|
|
|
||||||
180
LICENSE
180
LICENSE
|
|
@ -1,165 +1,19 @@
|
||||||
GNU LESSER GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
of this license document, but changing it is not allowed.
|
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.
|
||||||
|
|
||||||
|
|
||||||
This version of the GNU Lesser General Public License incorporates
|
|
||||||
the terms and conditions of version 3 of the GNU General Public
|
|
||||||
License, supplemented by the additional permissions listed below.
|
|
||||||
|
|
||||||
0. Additional Definitions.
|
|
||||||
|
|
||||||
As used herein, "this License" refers to version 3 of the GNU Lesser
|
|
||||||
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
|
||||||
General Public License.
|
|
||||||
|
|
||||||
"The Library" refers to a covered work governed by this License,
|
|
||||||
other than an Application or a Combined Work as defined below.
|
|
||||||
|
|
||||||
An "Application" is any work that makes use of an interface provided
|
|
||||||
by the Library, but which is not otherwise based on the Library.
|
|
||||||
Defining a subclass of a class defined by the Library is deemed a mode
|
|
||||||
of using an interface provided by the Library.
|
|
||||||
|
|
||||||
A "Combined Work" is a work produced by combining or linking an
|
|
||||||
Application with the Library. The particular version of the Library
|
|
||||||
with which the Combined Work was made is also called the "Linked
|
|
||||||
Version".
|
|
||||||
|
|
||||||
The "Minimal Corresponding Source" for a Combined Work means the
|
|
||||||
Corresponding Source for the Combined Work, excluding any source code
|
|
||||||
for portions of the Combined Work that, considered in isolation, are
|
|
||||||
based on the Application, and not on the Linked Version.
|
|
||||||
|
|
||||||
The "Corresponding Application Code" for a Combined Work means the
|
|
||||||
object code and/or source code for the Application, including any data
|
|
||||||
and utility programs needed for reproducing the Combined Work from the
|
|
||||||
Application, but excluding the System Libraries of the Combined Work.
|
|
||||||
|
|
||||||
1. Exception to Section 3 of the GNU GPL.
|
|
||||||
|
|
||||||
You may convey a covered work under sections 3 and 4 of this License
|
|
||||||
without being bound by section 3 of the GNU GPL.
|
|
||||||
|
|
||||||
2. Conveying Modified Versions.
|
|
||||||
|
|
||||||
If you modify a copy of the Library, and, in your modifications, a
|
|
||||||
facility refers to a function or data to be supplied by an Application
|
|
||||||
that uses the facility (other than as an argument passed when the
|
|
||||||
facility is invoked), then you may convey a copy of the modified
|
|
||||||
version:
|
|
||||||
|
|
||||||
a) under this License, provided that you make a good faith effort to
|
|
||||||
ensure that, in the event an Application does not supply the
|
|
||||||
function or data, the facility still operates, and performs
|
|
||||||
whatever part of its purpose remains meaningful, or
|
|
||||||
|
|
||||||
b) under the GNU GPL, with none of the additional permissions of
|
|
||||||
this License applicable to that copy.
|
|
||||||
|
|
||||||
3. Object Code Incorporating Material from Library Header Files.
|
|
||||||
|
|
||||||
The object code form of an Application may incorporate material from
|
|
||||||
a header file that is part of the Library. You may convey such object
|
|
||||||
code under terms of your choice, provided that, if the incorporated
|
|
||||||
material is not limited to numerical parameters, data structure
|
|
||||||
layouts and accessors, or small macros, inline functions and templates
|
|
||||||
(ten or fewer lines in length), you do both of the following:
|
|
||||||
|
|
||||||
a) Give prominent notice with each copy of the object code that the
|
|
||||||
Library is used in it and that the Library and its use are
|
|
||||||
covered by this License.
|
|
||||||
|
|
||||||
b) Accompany the object code with a copy of the GNU GPL and this license
|
|
||||||
document.
|
|
||||||
|
|
||||||
4. Combined Works.
|
|
||||||
|
|
||||||
You may convey a Combined Work under terms of your choice that,
|
|
||||||
taken together, effectively do not restrict modification of the
|
|
||||||
portions of the Library contained in the Combined Work and reverse
|
|
||||||
engineering for debugging such modifications, if you also do each of
|
|
||||||
the following:
|
|
||||||
|
|
||||||
a) Give prominent notice with each copy of the Combined Work that
|
|
||||||
the Library is used in it and that the Library and its use are
|
|
||||||
covered by this License.
|
|
||||||
|
|
||||||
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
|
||||||
document.
|
|
||||||
|
|
||||||
c) For a Combined Work that displays copyright notices during
|
|
||||||
execution, include the copyright notice for the Library among
|
|
||||||
these notices, as well as a reference directing the user to the
|
|
||||||
copies of the GNU GPL and this license document.
|
|
||||||
|
|
||||||
d) Do one of the following:
|
|
||||||
|
|
||||||
0) Convey the Minimal Corresponding Source under the terms of this
|
|
||||||
License, and the Corresponding Application Code in a form
|
|
||||||
suitable for, and under terms that permit, the user to
|
|
||||||
recombine or relink the Application with a modified version of
|
|
||||||
the Linked Version to produce a modified Combined Work, in the
|
|
||||||
manner specified by section 6 of the GNU GPL for conveying
|
|
||||||
Corresponding Source.
|
|
||||||
|
|
||||||
1) Use a suitable shared library mechanism for linking with the
|
|
||||||
Library. A suitable mechanism is one that (a) uses at run time
|
|
||||||
a copy of the Library already present on the user's computer
|
|
||||||
system, and (b) will operate properly with a modified version
|
|
||||||
of the Library that is interface-compatible with the Linked
|
|
||||||
Version.
|
|
||||||
|
|
||||||
e) Provide Installation Information, but only if you would otherwise
|
|
||||||
be required to provide such information under section 6 of the
|
|
||||||
GNU GPL, and only to the extent that such information is
|
|
||||||
necessary to install and execute a modified version of the
|
|
||||||
Combined Work produced by recombining or relinking the
|
|
||||||
Application with a modified version of the Linked Version. (If
|
|
||||||
you use option 4d0, the Installation Information must accompany
|
|
||||||
the Minimal Corresponding Source and Corresponding Application
|
|
||||||
Code. If you use option 4d1, you must provide the Installation
|
|
||||||
Information in the manner specified by section 6 of the GNU GPL
|
|
||||||
for conveying Corresponding Source.)
|
|
||||||
|
|
||||||
5. Combined Libraries.
|
|
||||||
|
|
||||||
You may place library facilities that are a work based on the
|
|
||||||
Library side by side in a single library together with other library
|
|
||||||
facilities that are not Applications and are not covered by this
|
|
||||||
License, and convey such a combined library under terms of your
|
|
||||||
choice, if you do both of the following:
|
|
||||||
|
|
||||||
a) Accompany the combined library with a copy of the same work based
|
|
||||||
on the Library, uncombined with any other library facilities,
|
|
||||||
conveyed under the terms of this License.
|
|
||||||
|
|
||||||
b) Give prominent notice with the combined library that part of it
|
|
||||||
is a work based on the Library, and explaining where to find the
|
|
||||||
accompanying uncombined form of the same work.
|
|
||||||
|
|
||||||
6. Revised Versions of the GNU Lesser General Public License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions
|
|
||||||
of the GNU Lesser General Public License from time to time. Such new
|
|
||||||
versions will be similar in spirit to the present version, but may
|
|
||||||
differ in detail to address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Library as you received it specifies that a certain numbered version
|
|
||||||
of the GNU Lesser General Public License "or any later version"
|
|
||||||
applies to it, you have the option of following the terms and
|
|
||||||
conditions either of that published version or of any later version
|
|
||||||
published by the Free Software Foundation. If the Library as you
|
|
||||||
received it does not specify a version number of the GNU Lesser
|
|
||||||
General Public License, you may choose any version of the GNU Lesser
|
|
||||||
General Public License ever published by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Library as you received it specifies that a proxy can decide
|
|
||||||
whether future versions of the GNU Lesser General Public License shall
|
|
||||||
apply, that proxy's public statement of acceptance of any version is
|
|
||||||
permanent authorization for you to choose that version for the
|
|
||||||
Library.
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
Changes between 1.0.x and 'trunk'
|
Changes between 1.0.x and 'trunk'
|
||||||
=====================================
|
=====================================
|
||||||
|
|
||||||
|
* use MIT license for pylib, add some contributors
|
||||||
|
|
||||||
* remove py.execnet code and substitute all usages with 'execnet' proper
|
* remove py.execnet code and substitute all usages with 'execnet' proper
|
||||||
|
|
||||||
* fix issue50 - cached_setup now caches more to expectations
|
* fix issue50 - cached_setup now caches more to expectations
|
||||||
|
|
|
||||||
40
doc/faq.txt
40
doc/faq.txt
|
|
@ -46,46 +46,6 @@ have no counterpart in nose_.
|
||||||
.. _nose: http://somethingaboutorange.com/mrl/projects/nose/0.11.1/
|
.. _nose: http://somethingaboutorange.com/mrl/projects/nose/0.11.1/
|
||||||
.. _features: test/features.html
|
.. _features: test/features.html
|
||||||
|
|
||||||
.. _whygpl:
|
|
||||||
|
|
||||||
Why did you choose a GPL-style license?
|
|
||||||
----------------------------------------
|
|
||||||
|
|
||||||
Older versions of the py lib and py.test (up until 1.0.x)
|
|
||||||
were licensed under the MIT license. Starting
|
|
||||||
with the 1.1 series Holger Krekel - being the main maintainer
|
|
||||||
and developer since several years - decided to go for
|
|
||||||
a GPL-style license mainly for these reasons:
|
|
||||||
|
|
||||||
1. increase likelyness of flow-back, contributions and publicity.
|
|
||||||
|
|
||||||
2. make use of the FSF_ efforts which produced a consistent and interoperable legal framework.
|
|
||||||
|
|
||||||
3. Potentially get some money from dual-licensing to companies.
|
|
||||||
|
|
||||||
Developers want to co-operate no matter what context they
|
|
||||||
are in, commercial, free, whatever. BSD-licenses sound like
|
|
||||||
a fit because they minimize the need for checking for
|
|
||||||
constraints from the company or legal department. They allow
|
|
||||||
to use and modify software for whatever purpose.
|
|
||||||
|
|
||||||
However, developers wanting to produce free software for a living
|
|
||||||
often need to connect to a sustainable revenue system. When
|
|
||||||
releasing software for public use they seek means, some security
|
|
||||||
on getting something back: Contributions, recognition or money.
|
|
||||||
The GPL license tries to foster a universe of free software and
|
|
||||||
force proprietary players to contribute back.
|
|
||||||
|
|
||||||
The py lib choose the Lesser GPL. It strikes a balance because it
|
|
||||||
allows the code to interact in proprietary contexts and increases
|
|
||||||
likelyness of flow backs.
|
|
||||||
|
|
||||||
If you do have or get actual practical issues regarding
|
|
||||||
licensing please get in contact_.
|
|
||||||
|
|
||||||
.. _fsf: http://www.fsf.org
|
|
||||||
.. _contact: contact.html
|
|
||||||
|
|
||||||
What's all this "magic" with py.test?
|
What's all this "magic" with py.test?
|
||||||
----------------------------------------
|
----------------------------------------
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
"""
|
"""
|
||||||
advanced testing and development support library:
|
advanced testing and development support library:
|
||||||
|
|
@ -17,14 +16,14 @@ For questions please check out http://pylib.org/contact.html
|
||||||
(c) Holger Krekel and others, 2009
|
(c) Holger Krekel and others, 2009
|
||||||
"""
|
"""
|
||||||
from py.initpkg import initpkg
|
from py.initpkg import initpkg
|
||||||
trunk = "trunk"
|
trunk = "1.1.0b1"
|
||||||
|
|
||||||
version = trunk or "1.0.x"
|
version = trunk or "1.0.x"
|
||||||
|
|
||||||
del trunk
|
del trunk
|
||||||
|
|
||||||
initpkg(__name__,
|
initpkg(__name__,
|
||||||
description = "py.test and pylib: advanced testing tool and networking lib",
|
description = "py.test and pylib: rapid testing and high-level path/code objects.",
|
||||||
version = version,
|
version = version,
|
||||||
url = "http://pylib.org",
|
url = "http://pylib.org",
|
||||||
license = "MIT license",
|
license = "MIT license",
|
||||||
|
|
@ -33,7 +32,7 @@ initpkg(__name__,
|
||||||
author_email = "holger at merlinux.eu, py-dev at codespeak.net",
|
author_email = "holger at merlinux.eu, py-dev at codespeak.net",
|
||||||
long_description = globals()['__doc__'],
|
long_description = globals()['__doc__'],
|
||||||
classifiers = [
|
classifiers = [
|
||||||
"Development Status :: 5 - Production/Stable",
|
"Development Status :: 4 - Beta",
|
||||||
"Intended Audience :: Developers",
|
"Intended Audience :: Developers",
|
||||||
"License :: OSI Approved :: MIT License",
|
"License :: OSI Approved :: MIT License",
|
||||||
"Operating System :: POSIX",
|
"Operating System :: POSIX",
|
||||||
|
|
|
||||||
8
setup.py
8
setup.py
|
|
@ -24,13 +24,13 @@ For questions please check out http://pylib.org/contact.html
|
||||||
(c) Holger Krekel and others, 2009
|
(c) Holger Krekel and others, 2009
|
||||||
|
|
||||||
"""
|
"""
|
||||||
trunk = 'trunk'
|
trunk = None
|
||||||
def main():
|
def main():
|
||||||
setup(
|
setup(
|
||||||
name='py',
|
name='py',
|
||||||
description='py.test and pylib: advanced testing tool and networking lib',
|
description='py.test and pylib: rapid testing and high-level path/code objects.',
|
||||||
long_description = long_description,
|
long_description = long_description,
|
||||||
version= trunk or 'trunk',
|
version= trunk or '1.1.0b1',
|
||||||
url='http://pylib.org',
|
url='http://pylib.org',
|
||||||
license='MIT license',
|
license='MIT license',
|
||||||
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
|
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
|
||||||
|
|
@ -45,7 +45,7 @@ def main():
|
||||||
'py.svnwcrevert = py.cmdline:pysvnwcrevert',
|
'py.svnwcrevert = py.cmdline:pysvnwcrevert',
|
||||||
'py.test = py.cmdline:pytest',
|
'py.test = py.cmdline:pytest',
|
||||||
'py.which = py.cmdline:pywhich']},
|
'py.which = py.cmdline:pywhich']},
|
||||||
classifiers=['Development Status :: 5 - Production/Stable',
|
classifiers=['Development Status :: 4 - Beta',
|
||||||
'Intended Audience :: Developers',
|
'Intended Audience :: Developers',
|
||||||
'License :: OSI Approved :: MIT License',
|
'License :: OSI Approved :: MIT License',
|
||||||
'Operating System :: POSIX',
|
'Operating System :: POSIX',
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue