Skip to content

Commit 628c029

Browse files
Josh Kleinwesm
Josh Klein
authored andcommitted
updated license and credits for overview
1 parent c63b785 commit 628c029

File tree

2 files changed

+82
-14
lines changed

2 files changed

+82
-14
lines changed

LICENSE

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1-
Copyright (c) 2008-2011 AQR Capital Management, LLC
1+
======================
2+
PANDAS LICENSING TERMS
3+
======================
4+
5+
pandas is licensed under the BSD 3-Clause (also known as "BSD New" or
6+
"BSD Simplified"), as follows:
7+
8+
Copyright (c) 2011-2012, Lambda Foundry, Inc. and PyData Development Team
29
All rights reserved.
310

4-
Copyright (c) 2011 Wes McKinney and pandas developers
11+
Copyright (c) 2008-2011 AQR Capital Management, LLC
512
All rights reserved.
613

714
Redistribution and use in source and binary forms, with or without
@@ -31,3 +38,43 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
3138
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3239
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3340
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
41+
42+
About the Copyright Holders
43+
===========================
44+
45+
AQR Capital Management began pandas development in 2008. Development was
46+
led by Wes McKinney. AQR released the source under this license in 2009.
47+
Wes is now an employee of Lambda Foundry, and remains the pandas project
48+
lead.
49+
50+
The PyData Development Team is the collection of developers of the PyData
51+
project. This includes all of the PyData sub-projects, including pandas. The
52+
core team that coordinates development on GitHub can be found here:
53+
http://github.com/pydata.
54+
55+
Full credits for pandas contributors can be found in the documentation.
56+
57+
Our Copyright Policy
58+
====================
59+
60+
PyData uses a shared copyright model. Each contributor maintains copyright
61+
over their contributions to PyData. However, it is important to note that
62+
these contributions are typically only changes to the repositories. Thus,
63+
the PyData source code, in its entirety, is not the copyright of any single
64+
person or institution. Instead, it is the collective copyright of the
65+
entire PyData Development Team. If individual contributors want to maintain
66+
a record of what changes/contributions they have specific copyright on,
67+
they should indicate their copyright in the commit message of the change
68+
when they commit the change to one of the PyData repositories.
69+
70+
With this in mind, the following banner should be used in any source code
71+
file to indicate the copyright and license terms:
72+
73+
#-----------------------------------------------------------------------------
74+
# Copyright (c) 2012, PyData Development Team
75+
# All rights reserved.
76+
#
77+
# Distributed under the terms of the BSD Simplified License.
78+
#
79+
# The full license is in the LICENSE file, distributed with this software.
80+
#-----------------------------------------------------------------------------

doc/source/overview.rst

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ Package overview
2424
* Static and moving window linear and `panel regression
2525
<http://en.wikipedia.org/wiki/Panel_data>`__
2626

27-
License
28-
-------
29-
30-
pandas is released under a standard 3-clause BSD license
31-
3227
Data structures at a glance
3328
---------------------------
3429

@@ -82,16 +77,42 @@ but, for example, columns can be inserted into a DataFrame. However, the vast
8277
majority of methods produce new objects and leave the input data untouched. In
8378
general, though, we like to **favor immutability** where sensible.
8479

80+
Development Team
81+
----------------
82+
83+
pandas is a part of the PyData project. The PyData Development Team is a
84+
collection of developers focused on the improvement of Python's data
85+
libraries. The core team that coordinates development can be found on `Github
86+
<http://github.com/pydata>`__. If you're interested in contributing, please
87+
visit the `project website <http://pandas.pydata.org>`__.
8588

86-
History
89+
Getting Support
90+
---------------
91+
92+
Users and developers are encouraged to join the `pystatsmodels mailing list
93+
<http://groups.google.com/group/pystatsmodels>`__ or to contact Wes McKinney
94+
directly at wesmckinn (-at-) gmail (-dot-) com.
95+
96+
For commercial support, training, or consulting, contact Wes at wes (-at-)
97+
lambdafoundry (-dot-) com.
98+
99+
Credits
87100
-------
88101

89102
pandas development began at `AQR Capital Management <http://www.aqr.com>`__ in
90-
April 2008. It was open-sourced at the end of 2009 and continues to be actively
91-
used and maintained.
92-
93-
Contact
103+
April 2008. It was open-sourced at the end of 2009. AQR continued to provide
104+
resources for development through the end of 2011, and continues to contribute
105+
bug reports today.
106+
107+
Since January 2012, `Lambda Foundry <http://www.lambdafoundry.com>`__, has
108+
been providing development resources, as well as commercial support,
109+
training, and consulting for pandas.
110+
111+
pandas is only made possible by a group of people around the world like you
112+
who have contributed new code, bug reports, fixes, comments and ideas. A
113+
complete list can be found `on Github <http://www.github.com/pydata/pandas/contributors>`__.
114+
115+
License
94116
-------
95117

96-
Please feel free to send comments or questions directly to Wes McKinney at
97-
wesmckinn (-at-) gmail (-dot-) com or the pystatsmodels mailing list.
118+
.. literalinclude:: ../../LICENSE

0 commit comments

Comments
 (0)