Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

updated license and credits for overview

  • Loading branch information...
commit 628c0295a526a3513fe291c8a325d53fbb807785 1 parent c63b785
@joshklein joshklein authored wesm committed
Showing with 82 additions and 14 deletions.
  1. +49 −2 LICENSE
  2. +33 −12 doc/source/overview.rst
View
51 LICENSE
@@ -1,7 +1,14 @@
-Copyright (c) 2008-2011 AQR Capital Management, LLC
+======================
+PANDAS LICENSING TERMS
+======================
+
+pandas is licensed under the BSD 3-Clause (also known as "BSD New" or
+"BSD Simplified"), as follows:
+
+Copyright (c) 2011-2012, Lambda Foundry, Inc. and PyData Development Team
All rights reserved.
-Copyright (c) 2011 Wes McKinney and pandas developers
+Copyright (c) 2008-2011 AQR Capital Management, LLC
All rights reserved.
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
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+About the Copyright Holders
+===========================
+
+AQR Capital Management began pandas development in 2008. Development was
+led by Wes McKinney. AQR released the source under this license in 2009.
+Wes is now an employee of Lambda Foundry, and remains the pandas project
+lead.
+
+The PyData Development Team is the collection of developers of the PyData
+project. This includes all of the PyData sub-projects, including pandas. The
+core team that coordinates development on GitHub can be found here:
+http://github.com/pydata.
+
+Full credits for pandas contributors can be found in the documentation.
+
+Our Copyright Policy
+====================
+
+PyData uses a shared copyright model. Each contributor maintains copyright
+over their contributions to PyData. However, it is important to note that
+these contributions are typically only changes to the repositories. Thus,
+the PyData source code, in its entirety, is not the copyright of any single
+person or institution. Instead, it is the collective copyright of the
+entire PyData Development Team. If individual contributors want to maintain
+a record of what changes/contributions they have specific copyright on,
+they should indicate their copyright in the commit message of the change
+when they commit the change to one of the PyData repositories.
+
+With this in mind, the following banner should be used in any source code
+file to indicate the copyright and license terms:
+
+#-----------------------------------------------------------------------------
+# Copyright (c) 2012, PyData Development Team
+# All rights reserved.
+#
+# Distributed under the terms of the BSD Simplified License.
+#
+# The full license is in the LICENSE file, distributed with this software.
+#-----------------------------------------------------------------------------
View
45 doc/source/overview.rst
@@ -24,11 +24,6 @@ Package overview
* Static and moving window linear and `panel regression
<http://en.wikipedia.org/wiki/Panel_data>`__
-License
--------
-
-pandas is released under a standard 3-clause BSD license
-
Data structures at a glance
---------------------------
@@ -82,16 +77,42 @@ but, for example, columns can be inserted into a DataFrame. However, the vast
majority of methods produce new objects and leave the input data untouched. In
general, though, we like to **favor immutability** where sensible.
+Development Team
+----------------
+
+pandas is a part of the PyData project. The PyData Development Team is a
+collection of developers focused on the improvement of Python's data
+libraries. The core team that coordinates development can be found on `Github
+<http://github.com/pydata>`__. If you're interested in contributing, please
+visit the `project website <http://pandas.pydata.org>`__.
-History
+Getting Support
+---------------
+
+Users and developers are encouraged to join the `pystatsmodels mailing list
+<http://groups.google.com/group/pystatsmodels>`__ or to contact Wes McKinney
+directly at wesmckinn (-at-) gmail (-dot-) com.
+
+For commercial support, training, or consulting, contact Wes at wes (-at-)
+lambdafoundry (-dot-) com.
+
+Credits
-------
pandas development began at `AQR Capital Management <http://www.aqr.com>`__ in
-April 2008. It was open-sourced at the end of 2009 and continues to be actively
-used and maintained.
-
-Contact
+April 2008. It was open-sourced at the end of 2009. AQR continued to provide
+resources for development through the end of 2011, and continues to contribute
+bug reports today.
+
+Since January 2012, `Lambda Foundry <http://www.lambdafoundry.com>`__, has
+been providing development resources, as well as commercial support,
+training, and consulting for pandas.
+
+pandas is only made possible by a group of people around the world like you
+who have contributed new code, bug reports, fixes, comments and ideas. A
+complete list can be found `on Github <http://www.github.com/pydata/pandas/contributors>`__.
+
+License
-------
-Please feel free to send comments or questions directly to Wes McKinney at
-wesmckinn (-at-) gmail (-dot-) com or the pystatsmodels mailing list.
+.. literalinclude:: ../../LICENSE
Please sign in to comment.
Something went wrong with that request. Please try again.