Changing LICENSE to Apache2

Changing LICENSE to Apache2 + cleaning up setup.py
This commit is contained in:
Stephen Dodson 2019-11-14 09:27:44 +00:00
parent dff49d01fe
commit 8b3c66a5c8
4 changed files with 208 additions and 209 deletions

359
LICENSE
View File

@ -1,223 +1,200 @@
ELASTIC LICENSE AGREEMENT
PLEASE READ CAREFULLY THIS ELASTIC LICENSE AGREEMENT (THIS "AGREEMENT"), WHICH Apache License
CONSTITUTES A LEGALLY BINDING AGREEMENT AND GOVERNS ALL OF YOUR USE OF ALL OF Version 2.0, January 2004
THE ELASTIC SOFTWARE WITH WHICH THIS AGREEMENT IS INCLUDED ("ELASTIC SOFTWARE") http://www.apache.org/licenses/
THAT IS PROVIDED IN OBJECT CODE FORMAT, AND, IN ACCORDANCE WITH SECTION 2 BELOW,
CERTAIN OF THE ELASTIC SOFTWARE THAT IS PROVIDED IN SOURCE CODE FORMAT. BY
INSTALLING OR USING ANY OF THE ELASTIC SOFTWARE GOVERNED BY THIS AGREEMENT, YOU
ARE ASSENTING TO THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE
WITH SUCH TERMS AND CONDITIONS, YOU MAY NOT INSTALL OR USE THE ELASTIC SOFTWARE
GOVERNED BY THIS AGREEMENT. IF YOU ARE INSTALLING OR USING THE SOFTWARE ON
BEHALF OF A LEGAL ENTITY, YOU REPRESENT AND WARRANT THAT YOU HAVE THE ACTUAL
AUTHORITY TO AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT ON BEHALF OF
SUCH ENTITY.
Posted Date: April 20, 2018 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
This Agreement is entered into by and between Elasticsearch BV ("Elastic") and 1. Definitions.
You, or the legal entity on behalf of whom You are acting (as applicable,
"You").
1. OBJECT CODE END USER LICENSES, RESTRICTIONS AND THIRD PARTY OPEN SOURCE "License" shall mean the terms and conditions for use, reproduction,
SOFTWARE and distribution as defined by Sections 1 through 9 of this document.
1.1 Object Code End User License. Subject to the terms and conditions of "Licensor" shall mean the copyright owner or entity authorized by
Section 1.2 of this Agreement, Elastic hereby grants to You, AT NO CHARGE and the copyright owner that is granting the License.
for so long as you are not in breach of any provision of this Agreement, a
License to the Basic Features and Functions of the Elastic Software.
1.2 Reservation of Rights; Restrictions. As between Elastic and You, Elastic "Legal Entity" shall mean the union of the acting entity and all
and its licensors own all right, title and interest in and to the Elastic other entities that control, are controlled by, or are under common
Software, and except as expressly set forth in Sections 1.1, and 2.1 of this control with that entity. For the purposes of this definition,
Agreement, no other license to the Elastic Software is granted to You under "control" means (i) the power, direct or indirect, to cause the
this Agreement, by implication, estoppel or otherwise. You agree not to: (i) direction or management of such entity, whether by contract or
reverse engineer or decompile, decrypt, disassemble or otherwise reduce any otherwise, or (ii) ownership of fifty percent (50%) or more of the
Elastic Software provided to You in Object Code, or any portion thereof, to outstanding shares, or (iii) beneficial ownership of such entity.
Source Code, except and only to the extent any such restriction is prohibited
by applicable law, (ii) except as expressly permitted in this Agreement,
prepare derivative works from, modify, copy or use the Elastic Software Object
Code or the Commercial Software Source Code in any manner; (iii) except as
expressly permitted in Section 1.1 above, transfer, sell, rent, lease,
distribute, sublicense, loan or otherwise transfer, Elastic Software Object
Code, in whole or in part, to any third party; (iv) use Elastic Software
Object Code for providing time-sharing services, any software-as-a-service,
service bureau services or as part of an application services provider or
other service offering (collectively, "SaaS Offering") where obtaining access
to the Elastic Software or the features and functions of the Elastic Software
is a primary reason or substantial motivation for users of the SaaS Offering
to access and/or use the SaaS Offering ("Prohibited SaaS Offering"); (v)
circumvent the limitations on use of Elastic Software provided to You in
Object Code format that are imposed or preserved by any License Key, or (vi)
alter or remove any Marks and Notices in the Elastic Software. If You have any
question as to whether a specific SaaS Offering constitutes a Prohibited SaaS
Offering, or are interested in obtaining Elastic's permission to engage in
commercial or non-commercial distribution of the Elastic Software, please
contact elastic_license@elastic.co.
1.3 Third Party Open Source Software. The Commercial Software may contain or "You" (or "Your") shall mean an individual or Legal Entity
be provided with third party open source libraries, components, utilities and exercising permissions granted by this License.
other open source software (collectively, "Open Source Software"), which Open
Source Software may have applicable license terms as identified on a website
designated by Elastic. Notwithstanding anything to the contrary herein, use of
the Open Source Software shall be subject to the license terms and conditions
applicable to such Open Source Software, to the extent required by the
applicable licensor (which terms shall not restrict the license rights granted
to You hereunder, but may contain additional rights). To the extent any
condition of this Agreement conflicts with any license to the Open Source
Software, the Open Source Software license will govern with respect to such
Open Source Software only. Elastic may also separately provide you with
certain open source software that is licensed by Elastic. Your use of such
Elastic open source software will not be governed by this Agreement, but by
the applicable open source license terms.
2. COMMERCIAL SOFTWARE SOURCE CODE "Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
2.1 Limited License. Subject to the terms and conditions of Section 2.2 of "Object" form shall mean any form resulting from mechanical
this Agreement, Elastic hereby grants to You, AT NO CHARGE and for so long as transformation or translation of a Source form, including but
you are not in breach of any provision of this Agreement, a limited, not limited to compiled object code, generated documentation,
non-exclusive, non-transferable, fully paid up royalty free right and license and conversions to other media types.
to the Commercial Software in Source Code format, without the right to grant
or authorize sublicenses, to prepare Derivative Works of the Commercial
Software, provided You (i) do not hack the licensing mechanism, or otherwise
circumvent the intended limitations on the use of Elastic Software to enable
features other than Basic Features and Functions or those features You are
entitled to as part of a Subscription, and (ii) use the resulting object code
only for reasonable testing purposes.
2.2 Restrictions. Nothing in Section 2.1 grants You the right to (i) use the "Work" shall mean the work of authorship, whether in Source or
Commercial Software Source Code other than in accordance with Section 2.1 Object form, made available under the License, as indicated by a
above, (ii) use a Derivative Work of the Commercial Software outside of a copyright notice that is included in or attached to the work
Non-production Environment, in any production capacity, on a temporary or (an example is provided in the Appendix below).
permanent basis, or (iii) transfer, sell, rent, lease, distribute, sublicense,
loan or otherwise make available the Commercial Software Source Code, in whole
or in part, to any third party. Notwithstanding the foregoing, You may
maintain a copy of the repository in which the Source Code of the Commercial
Software resides and that copy may be publicly accessible, provided that you
include this Agreement with Your copy of the repository.
3. TERMINATION "Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
3.1 Termination. This Agreement will automatically terminate, whether or not "Contribution" shall mean any work of authorship, including
You receive notice of such Termination from Elastic, if You breach any of its the original version of the Work and any modifications or additions
provisions. to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
3.2 Post Termination. Upon any termination of this Agreement, for any reason, "Contributor" shall mean Licensor and any individual or Legal Entity
You shall promptly cease the use of the Elastic Software in Object Code format on behalf of whom a Contribution has been received by Licensor and
and cease use of the Commercial Software in Source Code format. For the subsequently incorporated within the Work.
avoidance of doubt, termination of this Agreement will not affect Your right
to use Elastic Software, in either Object Code or Source Code formats, made
available under the Apache License Version 2.0.
3.3 Survival. Sections 1.2, 2.2. 3.3, 4 and 5 shall survive any termination or 2. Grant of Copyright License. Subject to the terms and conditions of
expiration of this Agreement. this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
4. DISCLAIMER OF WARRANTIES AND LIMITATION OF LIABILITY 3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4.1 Disclaimer of Warranties. TO THE MAXIMUM EXTENT PERMITTED UNDER APPLICABLE 4. Redistribution. You may reproduce and distribute copies of the
LAW, THE ELASTIC SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, Work or Derivative Works thereof in any medium, with or without
AND ELASTIC AND ITS LICENSORS MAKE NO WARRANTIES WHETHER EXPRESSED, IMPLIED OR modifications, and in Source or Object form, provided that You
STATUTORY REGARDING OR RELATING TO THE ELASTIC SOFTWARE. TO THE MAXIMUM EXTENT meet the following conditions:
PERMITTED UNDER APPLICABLE LAW, ELASTIC AND ITS LICENSORS SPECIFICALLY
DISCLAIM ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE AND NON-INFRINGEMENT WITH RESPECT TO THE ELASTIC SOFTWARE, AND WITH
RESPECT TO THE USE OF THE FOREGOING. FURTHER, ELASTIC DOES NOT WARRANT RESULTS
OF USE OR THAT THE ELASTIC SOFTWARE WILL BE ERROR FREE OR THAT THE USE OF THE
ELASTIC SOFTWARE WILL BE UNINTERRUPTED.
4.2 Limitation of Liability. IN NO EVENT SHALL ELASTIC OR ITS LICENSORS BE (a) You must give any other recipients of the Work or
LIABLE TO YOU OR ANY THIRD PARTY FOR ANY DIRECT OR INDIRECT DAMAGES, Derivative Works a copy of this License; and
INCLUDING, WITHOUT LIMITATION, FOR ANY LOSS OF PROFITS, LOSS OF USE, BUSINESS
INTERRUPTION, LOSS OF DATA, COST OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY
SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND, IN CONNECTION WITH
OR ARISING OUT OF THE USE OR INABILITY TO USE THE ELASTIC SOFTWARE, OR THE
PERFORMANCE OF OR FAILURE TO PERFORM THIS AGREEMENT, WHETHER ALLEGED AS A
BREACH OF CONTRACT OR TORTIOUS CONDUCT, INCLUDING NEGLIGENCE, EVEN IF ELASTIC
HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
5. MISCELLANEOUS (b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
This Agreement completely and exclusively states the entire agreement of the (c) You must retain, in the Source form of any Derivative Works
parties regarding the subject matter herein, and it supersedes, and its terms that You distribute, all copyright, patent, trademark, and
govern, all prior proposals, agreements, or other communications between the attribution notices from the Source form of the Work,
parties, oral or written, regarding such subject matter. This Agreement may be excluding those notices that do not pertain to any part of
modified by Elastic from time to time, and any such modifications will be the Derivative Works; and
effective upon the "Posted Date" set forth at the top of the modified
Agreement. If any provision hereof is held unenforceable, this Agreement will
continue without said provision and be interpreted to reflect the original
intent of the parties. This Agreement and any non-contractual obligation
arising out of or in connection with it, is governed exclusively by Dutch law.
This Agreement shall not be governed by the 1980 UN Convention on Contracts
for the International Sale of Goods. All disputes arising out of or in
connection with this Agreement, including its existence and validity, shall be
resolved by the courts with jurisdiction in Amsterdam, The Netherlands, except
where mandatory law provides for the courts at another location in The
Netherlands to have jurisdiction. The parties hereby irrevocably waive any and
all claims and defenses either might otherwise have in any such action or
proceeding in any of such courts based upon any alleged lack of personal
jurisdiction, improper venue, forum non conveniens or any similar claim or
defense. A breach or threatened breach, by You of Section 2 may cause
irreparable harm for which damages at law may not provide adequate relief, and
therefore Elastic shall be entitled to seek injunctive relief without being
required to post a bond. You may not assign this Agreement (including by
operation of law in connection with a merger or acquisition), in whole or in
part to any third party without the prior written consent of Elastic, which
may be withheld or granted by Elastic in its sole and absolute discretion.
Any assignment in violation of the preceding sentence is void. Notices to
Elastic may also be sent to legal@elastic.co.
6. DEFINITIONS (d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
The following terms have the meanings ascribed: You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
6.1 "Affiliate" means, with respect to a party, any entity that controls, is 5. Submission of Contributions. Unless You explicitly state otherwise,
controlled by, or which is under common control with, such party, where any Contribution intentionally submitted for inclusion in the Work
"control" means ownership of at least fifty percent (50%) of the outstanding by You to the Licensor shall be under the terms and conditions of
voting shares of the entity, or the contractual right to establish policy for, this License, without any additional terms or conditions.
and manage the operations of, the entity. Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6.2 "Basic Features and Functions" means those features and functions of the 6. Trademarks. This License does not grant permission to use the trade
Elastic Software that are eligible for use under a Basic license, as set forth names, trademarks, service marks, or product names of the Licensor,
at https://www.elastic.co/subscriptions, as may be modified by Elastic from except as required for reasonable and customary use in describing the
time to time. origin of the Work and reproducing the content of the NOTICE file.
6.3 "Commercial Software" means the Elastic Software Source Code in any file 7. Disclaimer of Warranty. Unless required by applicable law or
containing a header stating the contents are subject to the Elastic License or agreed to in writing, Licensor provides the Work (and each
which is contained in the repository folder labeled "x-pack", unless a LICENSE Contributor provides its Contributions) on an "AS IS" BASIS,
file present in the directory subtree declares a different license. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
6.4 "Derivative Work of the Commercial Software" means, for purposes of this 8. Limitation of Liability. In no event and under no legal theory,
Agreement, any modification(s) or enhancement(s) to the Commercial Software, whether in tort (including negligence), contract, or otherwise,
which represent, as a whole, an original work of authorship. unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
6.5 "License" means a limited, non-exclusive, non-transferable, fully paid up, 9. Accepting Warranty or Additional Liability. While redistributing
royalty free, right and license, without the right to grant or authorize the Work or Derivative Works thereof, You may choose to offer,
sublicenses, solely for Your internal business operations to (i) install and and charge a fee for, acceptance of support, warranty, indemnity,
use the applicable Features and Functions of the Elastic Software in Object or other liability obligations and/or rights consistent with this
Code, and (ii) permit Contractors and Your Affiliates to use the Elastic License. However, in accepting such obligations, You may act only
software as set forth in (i) above, provided that such use by Contractors must on Your own behalf and on Your sole responsibility, not on behalf
be solely for Your benefit and/or the benefit of Your Affiliates, and You of any other Contributor, and only if You agree to indemnify,
shall be responsible for all acts and omissions of such Contractors and defend, and hold each Contributor harmless for any liability
Affiliates in connection with their use of the Elastic software that are incurred by, or claims asserted against, such Contributor by reason
contrary to the terms and conditions of this Agreement. of your accepting any such warranty or additional liability.
6.6 "License Key" means a sequence of bytes, including but not limited to a APPENDIX: How to apply the Apache License to your work.
JSON blob, that is used to enable certain features and functions of the
Elastic Software.
6.7 "Marks and Notices" means all Elastic trademarks, trade names, logos and To apply the Apache License to your work, attach the following
notices present on the Documentation as originally provided by Elastic. boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
6.8 "Non-production Environment" means an environment for development, testing Copyright 2019 Elasticsearch BV
or quality assurance, where software is not used for production purposes.
6.9 "Object Code" means any form resulting from mechanical transformation or Licensed under the Apache License, Version 2.0 (the "License");
translation of Source Code form, including but not limited to compiled object you may not use this file except in compliance with the License.
code, generated documentation, and conversions to other media types. You may obtain a copy of the License at
6.10 "Source Code" means the preferred form of computer software for making http://www.apache.org/licenses/LICENSE-2.0
modifications, including but not limited to software source code,
documentation source, and configuration files.
6.11 "Subscription" means the right to receive Support Services and a License Unless required by applicable law or agreed to in writing, software
to the Commercial Software. distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

View File

@ -1 +1 @@
include README.rst include LICENSE

6
eland/__version__.py Normal file
View File

@ -0,0 +1,6 @@
__title__ = 'eland'
__description__ = 'Python elasticsearch client to analyse, explore and manipulate data that resides in elasticsearch.'
__url__ = 'https://github.com/elastic/app-search-python'
__version__ = '0.1'
__maintainer__ = 'Elasticsearch B.V.'
__maintainer_email__ = 'steve.dodson@elastic.co'

View File

@ -1,21 +1,37 @@
from setuptools import setup from setuptools import setup, find_packages
from codecs import open
from os import path
here = path.abspath(path.dirname(__file__))
def readme(): with open(path.join(here, 'README.md'), encoding='utf-8') as f:
with open('README.rst') as f: long_description = f.read()
return f.read()
here = path.abspath(path.dirname(__file__))
about = {}
with open(path.join(here, 'eland', '__version__.py'), 'r', 'utf-8') as f:
exec(f.read(), about)
setup(name='eland', setup(
version='0.1', name=about['__title__'],
description='Python elasticsearch client to analyse, explore and manipulate data that resides in elasticsearch', version=about['__version__'],
url='http://github.com/elastic/eland', description=about['__description__'],
author='Stephen Dodson', long_description=long_description,
author_email='sjd171@gmail.com', long_description_content_type='text/markdown',
license='ELASTIC LICENSE', url=about['__url__'],
packages=['eland'], maintainer=about['__maintainer__'],
install_requires=[ maintainer_email=about['__maintainer_email__'],
'elasticsearch>=7.0.5', license='Apache 2.0',
'pandas==0.25.1' classifiers=[
], 'Development Status :: 4 - Beta',
zip_safe=False) 'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python :: 3.7',
],
keywords='elastic eland pandas python',
install_requires=[
'elasticsearch>=7.0.5',
'pandas==0.25.1',
'matplotlib'
]
)