Merge pull request #161 from vidartf/auto-conf

 Add configuration dir data files

Author: vidartf

jupyter-config/notebook.d/jupyter-threejs.json

@@ -0,0 +1,5 @@
+{
+  "load_extensions": {
+    "jupyter-threejs/extension": true
+  }
+}

setup.py

@@ -31,11 +31,17 @@
     'js',
     data_files_spec=[
         ('share/jupyter/nbextensions/jupyter-threejs',
-         name + '/static', '*.js'),
+         name + '/static',
+         '*.js'),
         ('share/jupyter/nbextensions/jupyter-threejs',
-         name + '/static', '*.js.map'),
+         name + '/static',
+         '*.js.map'),
         ('share/jupyter/lab/extensions',
-         'js/lab-dist', 'jupyter-threejs-*.tgz'),
+         'js/lab-dist',
+         'jupyter-threejs-*.tgz'),
+        ('etc/jupyter/nbconfig',
+         'jupyter-config',
+         '**/*.json'),
     ],
 )
 cmdclass['js'] = combine_commands(

setupbase.py

@@ -502,13 +502,20 @@ def run(self):
     return FileHandler
 
 
-def _get_data_files(data_specs, existing):
+def _glob_pjoin(*parts):
+    """Join paths for glob processing"""
+    if parts[0] in ('.', ''):
+        parts = parts[1:]
+    return pjoin(*parts).replace(os.sep, '/')
+
+
+def _get_data_files(data_specs, existing, top=HERE):
     """Expand data file specs into valid data files metadata.
 
     Parameters
     ----------
     data_specs: list of tuples
-        See [createcmdclass] for description.
+        See [create_cmdclass] for description.
     existing: list of tuples
         The existing distrubution data_files metadata.
 
@@ -524,14 +531,16 @@ def _get_data_files(data_specs, existing):
     # Extract the files and assign them to the proper data
     # files path.
     for (path, dname, pattern) in data_specs or []:
+        if os.path.isabs(dname):
+            dname = os.path.relpath(dname, top)
         dname = dname.replace(os.sep, '/')
-        offset = len(dname) + 1
-
-        files = _get_files(pjoin(dname, pattern))
+        offset = 0 if dname in ('.', '') else len(dname) + 1
+        files = _get_files(_glob_pjoin(dname, pattern), top=top)
         for fname in files:
             # Normalize the path.
             root = os.path.dirname(fname)
-            full_path = '/'.join([path, root[offset:]])
+            full_path = _glob_pjoin(path, root[offset:])
+            print(dname, root, full_path, offset)
             if full_path.endswith('/'):
                 full_path = full_path[:-1]
             file_data[full_path].append(fname)
@@ -576,7 +585,8 @@ def _get_files(file_patterns, top=HERE):
             dirnames.remove('node_modules')
         for m in matchers:
             for filename in filenames:
-                fn = os.path.relpath(pjoin(root, filename), top)
+                fn = os.path.relpath(_glob_pjoin(root, filename), top)
+                fn = fn.replace(os.sep, '/')
                 if m(fn):
                     files.add(fn.replace(os.sep, '/'))
 
@@ -601,7 +611,7 @@ def _get_package_data(root, file_patterns=None):
     """
     if file_patterns is None:
         file_patterns = ['*']
-    return _get_files(file_patterns, pjoin(HERE, root))
+    return _get_files(file_patterns, _glob_pjoin(HERE, root))
 
 
 def _compile_pattern(pat, ignore_case=True):