diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000000..158c3c3a0a --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,8 @@ +prune examples/ +prune test_data/ +prune perspective/*.so +prune perspective/include/ +prune perspective/src/ +prune src/ +include python/requirements.txt +include CMakeList.txt diff --git a/python/LICENSE b/python/LICENSE deleted file mode 100644 index 261eeb9e9f..0000000000 --- a/python/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "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. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - 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." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright 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 - 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. - - 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. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (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. - - 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. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - 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. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - 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. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - 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. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - 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. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, 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. diff --git a/python/MANIFEST.in b/python/MANIFEST.in deleted file mode 100644 index b157307533..0000000000 --- a/python/MANIFEST.in +++ /dev/null @@ -1,4 +0,0 @@ -recursive-include perspective * -prune examples/ -prune test_data/ -include requirements.txt diff --git a/python/Makefile b/python/Makefile index 0a65f48612..866232401a 100644 --- a/python/Makefile +++ b/python/Makefile @@ -1,9 +1,9 @@ build: ## build the package - python3 setup.py build + cd .. && python3 setup.py build inplace: ## copy things inplace - cp `find build -name "libbinding.so"` perspective/table/ - cp `find build -name "libpsp.so"` perspective/table/ + cp `find ../build -name "libbinding.so"` perspective/table/ + cp `find ../build -name "libpsp.so"` perspective/table/ tests: inplace ## Clean and Make unit tests python3 -m nose2 -v perspective --with-coverage --coverage=perspective @@ -31,7 +31,7 @@ clean: ## clean the repository find . -name "*.a" | xargs rm -rf install: ## install to site-packages - python3 setup.py install + python3 -m pip install .. preinstall: ## install dependencies python3 -m pip install -r requirements.txt @@ -40,7 +40,7 @@ docs: ## make documentation make -C ./docs html dist: ## dist to pypi - python3 setup.py sdist upload -r pypi + python3 ../setup.py sdist upload -r pypi # Thanks to Francoise at marmelab.com for this .DEFAULT_GOAL := help diff --git a/python/README.md b/python/README.md deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/python/setup.cfg b/python/setup.cfg deleted file mode 100644 index c82b8d2e68..0000000000 --- a/python/setup.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[bdist_wheel] -universal=1 - -[metadata] -description_file = README.md - -[flake8] -max-line-length=200 -exclude=perspective/tests \ No newline at end of file diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000000..6ed14e7656 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,19 @@ +[metadata] +description_file = README.md + +[flake8] +max-line-length=200 +exclude= + python/perspective/tests, + build, + cmake, + cppbuild, + docker, + docs, + examples, + node_modules, + obj, + packages, + script, + src, + test \ No newline at end of file diff --git a/python/setup.py b/setup.py similarity index 89% rename from python/setup.py rename to setup.py index 07afe2c5b7..6fd6a1cc9a 100644 --- a/python/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ import os import os.path import pathlib -from setuptools import setup, find_packages, Extension +from setuptools import setup, Extension from setuptools.command.build_ext import build_ext as build_ext_orig from codecs import open @@ -34,7 +34,7 @@ def run(self): def build_cmake(self, ext): cwd = pathlib.Path().absolute() - directory = os.path.abspath(os.path.join(pathlib.Path().absolute(), '..')) + directory = os.path.abspath(os.path.join(pathlib.Path().absolute())) # these dirs will be created in build_py, so if you don't have # any python sources to bundle, the dirs will be missing @@ -46,7 +46,7 @@ def build_cmake(self, ext): # example of cmake args config = 'Debug' if self.debug else 'Release' cmake_args = [ - '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + str(os.path.join(extdir.parent.absolute(), 'perspective')), + '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + str(os.path.join(extdir.parent.absolute(), 'python', 'perspective', 'table')), '-DCMAKE_BUILD_TYPE=' + config, '-DPSP_CPP_BUILD=1', '-DPSP_WASM_BUILD=0', @@ -68,12 +68,11 @@ def build_cmake(self, ext): setup( - name='perspective-python', - version='0.0.1', + name='perspective-python.table', + version='0.1.3', description='Analytics library', long_description=long_description, url='https://github.com/jpmorganchase/perspective', - download_url='https://github.com/jpmorganchase/perspective/archive/v0.0.1.tar.gz', author='Tim Paine', author_email='timothy.k.paine@gmail.com', license='Apache 2.0', @@ -88,9 +87,8 @@ def build_cmake(self, ext): ], keywords='analytics tools plotting', - # packages=find_packages(exclude=['tests', ]), + package_dir={'': 'python'}, packages=['perspective.table'], - include_package_data=True, zip_safe=False, ext_modules=[ CMakeExtension('perspective')