Merge pull request #78 from timkpaine/tkp/hf

Hotfix to only build once

MANIFEST.in

@@ -7,9 +7,10 @@ include setup.cfg
 include pyproject.toml
 include Makefile
 
-recursive-include ipydagred3/extension *.*
-recursive-include ipydagred3/labextension *.*
-recursive-include ipydagred3/nbextension *.*
+graft ipydagred3
+graft ipydagred3/extension
+graft ipydagred3/labextension
+graft ipydagred3/nbextension
 
 # grab js
 graft js

Makefile

@@ -26,10 +26,10 @@ fix: fixpy fixjs  ## run black/tslint fix
 
 check: checks
 checks:  ## run lint and other checks
-	check-manifest
+	check-manifest -v
 
-build: clean  ## build python/javascript
-	python -m build . -s -w
+build:  ## build python/javascript
+	python -m build .
 
 develop:  ## install to site-packages in editable mode
 	python -m pip install --upgrade build pip setuptools twine wheel

ipydagred3/_version.py

@@ -1 +1 @@
-__version__ = "0.3.3"
+__version__ = "0.3.4"

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipydagred3",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "A Custom Jupyter Widget Library",
   "keywords": [
     "jupyter",
@@ -31,7 +31,7 @@
     "build:babel": "babel src/ --source-maps --out-dir lib/",
     "build:labextension": "jupyter labextension build .",
     "build:nbextension": "webpack --mode=production",
-    "build": "npm-run-all build:*",
+    "build": "npm-run-all clean build:*",
     "clean": "npm-run-all clean:*",
     "clean:lib": "rimraf lib",
     "clean:labextension": "rimraf ../ipydagred3/labextension",

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
 requires = ["setuptools", "wheel", "jupyter-packaging<2", "jupyterlab>=3"]
-build-backend = "setuptools.build_meta"
+build-backend = "jupyter_packaging.build_api"

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.3
+current_version = 0.3.4
 commit = True
 tag = False
 

setup.py

@@ -54,7 +54,7 @@
 
 data_spec = [
     # Lab extension installed by default:
-    ("share/jupyter/nbextensions/ipydagred3", nb_path, "*.js*"),
+    ("share/jupyter/nbextensions/ipydagred3", nb_path, "**"),
     ("etc/jupyter/nbconfig/notebook.d", ext_path, "ipydagred3.json"),
     (
         "share/jupyter/labextensions/ipydagred3",
@@ -66,16 +66,18 @@
 ]
 
 ensured_targets = [
-    pjoin(jshere, "lib", "index.js"),
-    pjoin(jshere, "style", "index.css"),
     pjoin(lab_path, "package.json"),
+    pjoin(lab_path, "static", "style.js"),
+    pjoin(nb_path, "index.js"),
 ]
 
-builder = npm_builder(build_cmd="build", path=jshere)
+builder = npm_builder(
+    build_cmd="build", path=jshere, source_dir=pjoin(jshere, "src"), build_dir=lab_path
+)
 
 setup(
     name=name,
-    version="0.3.3",
+    version="0.3.4",
     description="ipywidgets wrapper around dagre-d3",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -99,19 +101,15 @@
         post_develop=builder, pre_dist=builder, ensured_targets=ensured_targets
     ),
     data_files=get_data_files(data_spec),
-    packages=find_packages(
-        exclude=[
-            "tests",
-        ]
-    ),
+    include_package_data=True,
+    zip_safe=False,
+    packages=find_packages(),
     install_requires=requires,
     test_suite="ipydagred3.tests",
     tests_require=requires_test,
     extras_require={
         "dev": requires_dev,
         "develop": requires_dev,
     },
-    include_package_data=True,
-    zip_safe=False,
     python_requires=">=3.7",
 )