Skip to content

Commit b3f992e

Browse files
committed
Merge pull request #14 from hayd/rename2
FIX correct license, package name and authors/email
2 parents 3471329 + c872abe commit b3f992e

File tree

2 files changed

+96
-5
lines changed

2 files changed

+96
-5
lines changed

LICENSE.md

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
=======
2+
License
3+
=======
4+
5+
pandas is distributed under a 3-clause ("Simplified" or "New") BSD
6+
license. Parts of NumPy, SciPy, numpydoc, bottleneck, which all have
7+
BSD-compatible licenses, are included. Their licenses follow the pandas
8+
license.
9+
10+
pandas license
11+
==============
12+
13+
Copyright (c) 2011-2012, Lambda Foundry, Inc. and PyData Development Team
14+
All rights reserved.
15+
16+
Copyright (c) 2008-2011 AQR Capital Management, LLC
17+
All rights reserved.
18+
19+
Redistribution and use in source and binary forms, with or without
20+
modification, are permitted provided that the following conditions are
21+
met:
22+
23+
* Redistributions of source code must retain the above copyright
24+
notice, this list of conditions and the following disclaimer.
25+
26+
* Redistributions in binary form must reproduce the above
27+
copyright notice, this list of conditions and the following
28+
disclaimer in the documentation and/or other materials provided
29+
with the distribution.
30+
31+
* Neither the name of the copyright holder nor the names of any
32+
contributors may be used to endorse or promote products derived
33+
from this software without specific prior written permission.
34+
35+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
36+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
37+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
38+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
39+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
40+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
41+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
42+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
43+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
44+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
45+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
46+
47+
About the Copyright Holders
48+
===========================
49+
50+
AQR Capital Management began pandas development in 2008. Development was
51+
led by Wes McKinney. AQR released the source under this license in 2009.
52+
Wes is now an employee of Lambda Foundry, and remains the pandas project
53+
lead.
54+
55+
The PyData Development Team is the collection of developers of the PyData
56+
project. This includes all of the PyData sub-projects, including pandas. The
57+
core team that coordinates development on GitHub can be found here:
58+
http://github.com/pydata.
59+
60+
Full credits for pandas contributors can be found in the documentation.
61+
62+
Our Copyright Policy
63+
====================
64+
65+
PyData uses a shared copyright model. Each contributor maintains copyright
66+
over their contributions to PyData. However, it is important to note that
67+
these contributions are typically only changes to the repositories. Thus,
68+
the PyData source code, in its entirety, is not the copyright of any single
69+
person or institution. Instead, it is the collective copyright of the
70+
entire PyData Development Team. If individual contributors want to maintain
71+
a record of what changes/contributions they have specific copyright on,
72+
they should indicate their copyright in the commit message of the change
73+
when they commit the change to one of the PyData repositories.
74+
75+
With this in mind, the following banner should be used in any source code
76+
file to indicate the copyright and license terms:
77+
78+
#-----------------------------------------------------------------------------
79+
# Copyright (c) 2012, PyData Development Team
80+
# All rights reserved.
81+
#
82+
# Distributed under the terms of the BSD Simplified License.
83+
#
84+
# The full license is in the LICENSE file, distributed with this software.
85+
#-----------------------------------------------------------------------------
86+
87+
Other licenses can be found in the LICENSES directory.

setup.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from setuptools import setup
77

88

9-
NAME = 'pandas_datareader'
9+
NAME = 'pandas-datareader'
1010

1111

1212
def version():
@@ -33,13 +33,16 @@ def readme():
3333
description="Data readers extracted from the pandas codebase,"
3434
"should be compatible with recent pandas versions",
3535
long_description=readme(),
36-
license='MIT License',
37-
author='Andy Hayden',
38-
author_email='andyhayden1@gmail.com',
39-
url='https://github.com/pydata/pandas_datareader',
36+
license='BSD License',
37+
author='The PyData Development Team',
38+
author_email='pydata@googlegroups.com',
39+
url='https://github.com/pydata/pandas-datareader',
4040
classifiers=[
4141
'Development Status :: 4 - Beta',
42+
'Environment :: Console',
43+
'Intended Audience :: Science/Research',
4244
'Operating System :: OS Independent',
45+
'Programming Language :: Cython',
4346
'Programming Language :: Python',
4447
'Programming Language :: Python :: 2',
4548
'Programming Language :: Python :: 2.6',
@@ -48,6 +51,7 @@ def readme():
4851
'Programming Language :: Python :: 3.2',
4952
'Programming Language :: Python :: 3.3',
5053
'Programming Language :: Python :: 3.4',
54+
'Topic :: Scientific/Engineering',
5155
],
5256
keywords='data',
5357
install_requires=INSTALL_REQUIRES,

0 commit comments

Comments
 (0)