will no coinstall namespaced with https://github.com/timkpaine/perspe…

…ctive-python

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

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

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

python/setup.py → 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')