Merge pull request #141 from vidartf/setupbase

Update setupbase for dist fixes

Author: vidartf

setup.cfg

@@ -3,9 +3,9 @@ universal=1
 
 [manifix]
 known_excludes =
-    .git
-    .gitignore
-    **/node_modules
+    .git/**
+    .git*
+    **/node_modules/**
     **/*.pyc
     .travis.yml
     screencast.gif

setup.py

@@ -1,53 +1,60 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import print_function
-from setuptools import setup, find_packages
 import os
 import sys
 
 from setupbase import (
+    setup,
+    log,
     create_cmdclass,
     install_npm,
+    combine_commands,
+    ensure_targets,
+    get_version,
 )
 
 
-from distutils import log
 log.set_verbosity(log.DEBUG)
 log.info('setup.py entered')
 log.info('$PATH=%s' % os.environ['PATH'])
 
 LONG_DESCRIPTION = 'A Python/ThreeJS bridge utilizing the Jupyter widget infrastructure.'
 
-
 here = os.path.abspath(os.path.dirname(sys.argv[0]))
+name = 'pythreejs'
+version = get_version(os.path.join(here, name, '_version.py'))
 
 
-version_ns = {}
-with open(os.path.join(here, 'pythreejs', '_version.py')) as f:
-    exec(f.read(), {}, version_ns)
-
-
-cmdclass = create_cmdclass(['js'])
-cmdclass['js'] = install_npm(
-    path=os.path.join(here, 'js'),
-    build_dir=os.path.join(here, 'pythreejs', 'static'),
-    source_dir=os.path.join(here, 'js'),
+cmdclass = create_cmdclass('js',
+    data_files_spec=[
+        ('share/jupyter/nbextensions/jupyter-threejs', [
+            name + '/static/*.js',
+            name + '/static/*.js.map',
+        ]),
+    ],
+)
+cmdclass['js'] = combine_commands(
+    install_npm(
+        path=os.path.join(here, 'js'),
+        build_dir=os.path.join(here, name, 'static'),
+        source_dir=os.path.join(here, 'js'),
+    ),
+    ensure_targets([
+        name + '/static/extension.js',
+        name + '/static/index.js',
+        'js/src/core/BufferAttribute.autogen.js',
+        name + '/core/BufferAttribute_autogen.py',
+    ]),
 )
 
 setup_args = {
-    'name': 'pythreejs',
-    'version': version_ns['__version__'],
+    'name': name,
+    'version': version,
     'description': 'Interactive 3d graphics for the Jupyter notebook, using Three.js from Jupyter interactive widgets.',
     'long_description': LONG_DESCRIPTION,
     'license': 'BSD',
     'include_package_data': True,
-    'data_files': [
-        ('share/jupyter/nbextensions/jupyter-threejs', [
-            'pythreejs/static/extension.js',
-            'pythreejs/static/index.js',
-            'pythreejs/static/index.js.map',
-        ]),
-    ],
     'install_requires': [
         'ipywidgets>=7,<8',
         'ipydatawidgets>=1.1.1',
@@ -64,7 +71,7 @@
             'scikit-image'
         ],
     },
-    'packages': ['pythreejs'],  # Manually specify here, update after autogen
+    'packages': [name],  # Manually specify here, update after autogen
     'zip_safe': False,
     'cmdclass': cmdclass,
     'author': 'PyThreejs Development Team',