simplify workflow

Author: Bud-Macaulay

.github/workflows/publish.yml

@@ -10,6 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/v')
 
+    permissions:
+      id-token: write
+      contents: read
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -22,19 +26,17 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install build hatch hatch-jupyter-builder
+          python -m pip install hatch hatch-jupyter-builder
 
-      - name: Build the package with Hatch
+      - name: Build the widget JS
         run: |
-          hatch build
+          npm ci
+          npm run build:widget
 
-      - name: Create GitHub release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: dist/*
-          generate_release_notes: true
+      - name: Build Python package
+        run: hatch build
 
-      - name: Publish package to PyPI (using trusted publisher)
+      - name: Publish package to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           packages-dir: dist/

optimadewidget/optimade_widget.py

@@ -3,8 +3,8 @@
 
 
 class OptimadeQuerierWidget(anywidget.AnyWidget):
-    _esm = "widget-dist/optimade_widget.js"
-    _css = "widget-dist/optimade_widget.css"
+    _esm = "optimadewidget/widget-dist/optimade_widget.js"
+    _css = "optimadewidget/widget-dist/optimade_widget.css"
 
     # synced state between Python ↔ JS
     base_url = traitlets.Unicode("").tag(sync=True)

pyproject.toml

@@ -4,58 +4,15 @@ build-backend = "hatchling.build"
 
 [project]
 name = "widget-optimade-client"
-version = "0.1.0"
+version = "0.0.1a"
 description = "A Jupyter widget for querying OPTIMADE-compatible providers"
 readme = "README.md"
 requires-python = ">=3.8"
-keywords = ["jupyter", "anywidget", "optimade", "materials", "science"]
-classifiers = [
-    "Development Status :: 4 - Beta",
-    "Framework :: Jupyter",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Topic :: Scientific/Engineering :: Chemistry",
-]
 dependencies = ["traitlets>=5.0", "anywidget>=0.2"]
 
-[project.urls]
-Home = "https://github.com/materialscloud-org/tools-optimadeclient-react"
-Source = "https://github.com/materialscloud-org/tools-optimadeclient-react"
-
-[project.optional-dependencies]
-dev = ["jupyterlab", "notebook", "watchfiles", "pytest", "black"]
-
-[tool.hatch.envs.default]
-features = ["dev"]
-
-# Build configuration
-[tool.hatch.build]
-only-packages = true
-artifacts = ["widget-dist/*"]
-
-[tool.hatch.build.hooks.jupyter-builder]
-build-function = "hatch_jupyter_builder.npm_builder"
-ensured-targets = ["widget-dist/optimade_widget.js"]
-skip-if-exists = ["widget-dist/optimade_widget.js"]
-dependencies = ["hatch-jupyter-builder>=0.5.0"]
-
-[tool.hatch.build.hooks.jupyter-builder.build-kwargs]
-npm = "npm"
-build_cmd = "build"
-
-# Optional: automatic version bumping
-[tool.bumpver]
-current_version = "v0.1.0"
-version_pattern = "vMAJOR.MINOR.PATCH[PYTAGNUM]"
-commit_message = "Bump version {old_version} -> {new_version}"
-commit = true
-tag = true
-push = true
-
-[tool.bumpver.file_patterns]
-"pyproject.toml" = [
-    'version = "{pep440_version}"',
-    'current_version = "{version}"'
-]
+[tool.hatch.build.targets.wheel]
+packages = ["optimadewidget"]
+include = [
+    "optimadewidget/widget-dist/*.js",
+    "optimadewidget/widget-dist/*.css"
+]

vite.widget.config.js

@@ -21,7 +21,7 @@ export default defineConfig({
       },
     },
     cssCodeSplit: true,
-    outDir: "widget-dist",
+    outDir: "optimadewidget/widget-dist",
     emptyOutDir: true,
   },
   base: "",