Address second round: wildcards, auto-PR, upload outputs, cleaner register_methods, formula docs

Agent-Logs-Url: https://github.com/yihui/gglite/sessions/42090aea-3171-40d2-b40b-07840c78eada

Co-authored-by: yihui <163582+yihui@users.noreply.github.com>

Author: Copilot

.Rbuildignore

@@ -8,7 +8,6 @@
 ^package-lock\.json$
 ^examples$
 ^G2$
-^tests/test-gglite\.qmd$
-^tests/test-gglite\.ipynb$
-^tests/test-quarto\.py$
-^tests/test-jupyter\.py$
+^tests/.*\.qmd$
+^tests/.*\.ipynb$
+^tests/.*\.py$

.github/copilot-instructions.md

@@ -212,6 +212,14 @@ g2(mtcars, ~ mpg)   # histogram
 g2(mtcars, ~ cyl)   # histogram (cyl is numeric in mtcars)
 ```
 
+The formula interface also works for other aesthetic channels by passing a
+one-sided formula as a named argument:
+```r
+g2(iris, Sepal.Length ~ Sepal.Width, color = ~ Species)
+g2(mtcars, hp ~ mpg, color = ~ cyl, size = ~ wt)
+g2(iris, Sepal.Length ~ Sepal.Width, shape = ~ Species)
+```
+
 **Drop explicit marks that can be automatically inferred.** gglite's
 `auto_mark()` detects the appropriate mark from the data types. Only specify
 a mark explicitly when you need a non-default one:

.github/workflows/test-quarto-jupyter.yml

@@ -6,14 +6,18 @@ on:
   workflow_dispatch:
   push:
     paths:
-      - 'tests/test-gglite.qmd'
-      - 'tests/test-gglite.ipynb'
+      - 'tests/*.qmd'
+      - 'tests/*.ipynb'
+      - 'tests/*.py'
   pull_request:
     paths:
-      - 'tests/test-gglite.qmd'
-      - 'tests/test-gglite.ipynb'
+      - 'tests/*.qmd'
+      - 'tests/*.ipynb'
+      - 'tests/*.py'
 
-permissions: read-all
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
   test:
@@ -57,10 +61,36 @@ jobs:
         env:
           SCREENSHOT_PATH: /tmp/jupyter-test.png
 
-      - name: Upload screenshots
+      - name: Open PR to update notebook if outputs changed (main only)
+        if: github.ref == 'refs/heads/main'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          python tests/normalize-notebook.py \
+            /tmp/test-gglite-executed.ipynb tests/test-gglite.ipynb
+          if git diff --quiet tests/test-gglite.ipynb; then
+            echo "Notebook outputs unchanged."
+          else
+            BRANCH="auto/update-notebook-$(date +%Y%m%d%H%M%S)"
+            git config user.email "github-actions[bot]@users.noreply.github.com"
+            git config user.name "github-actions[bot]"
+            git checkout -b "$BRANCH"
+            git add tests/test-gglite.ipynb
+            git commit -m "Update notebook outputs"
+            git push origin "$BRANCH"
+            gh pr create \
+              --title "Update notebook outputs" \
+              --body "Automated update of notebook cell outputs after execution on main." \
+              --base main --head "$BRANCH"
+          fi
+
+      - name: Upload artifacts
         if: always()
         uses: actions/upload-artifact@HEAD
         with:
-          name: browser-screenshots
-          path: /tmp/*.png
+          name: test-outputs
+          path: |
+            /tmp/*.png
+            tests/test-gglite.html
+            /tmp/test-gglite-executed.ipynb
 

R/render.R

@@ -385,14 +385,12 @@ record_print.g2 = function(x, ...) {
 }
 
 register_methods = function(pkgs, generics) {
-  stopifnot(length(pkgs) == length(generics))
   for (i in seq_along(pkgs)) local({
     pkg = pkgs[[i]]; generic = generics[[i]]
-    method_name = paste0(generic, '.g2')
     hook = function(...) {
       registerS3method(
         generic, 'g2',
-        get(method_name, envir = asNamespace('gglite')),
+        asNamespace('gglite')[[paste0(generic, '.g2')]],
         envir = asNamespace(pkg)
       )
     }

tests/normalize-notebook.py

@@ -0,0 +1,27 @@
+"""Normalize and copy an executed Jupyter notebook.
+
+Strips execution metadata (execution counts, timestamps) that change between
+runs and copies the normalized notebook to the target path. Used by CI to
+produce a clean diff when deciding whether to open a PR.
+
+Usage: python tests/normalize-notebook.py <source.ipynb> <target.ipynb>
+"""
+import json, sys
+
+
+def normalize(nb: dict) -> dict:
+    for cell in nb.get('cells', []):
+        cell['execution_count'] = None
+        cell.get('metadata', {}).pop('execution', None)
+        for out in cell.get('outputs', []):
+            out.pop('execution_count', None)
+    return nb
+
+
+if __name__ == '__main__':
+    src, dst = sys.argv[1], sys.argv[2]
+    with open(src) as f:
+        nb = json.load(f)
+    with open(dst, 'w') as f:
+        json.dump(normalize(nb), f, indent=1)
+        f.write('\n')

tests/testit/test-gglite.R

@@ -502,7 +502,7 @@ assert('repr_html.g2 returns complete HTML with CDN and chart', {
   (grepl('G2.Chart', html, fixed = TRUE))
 })
 
-if (xfun::loadable('repr')) assert('repr methods are registered when repr is loaded', {
+assert('repr methods are registered when repr is loaded', {
   loadNamespace('repr')
   chart = g2(mtcars, x = 'mpg', y = 'hp') |> mark_point()
   html = repr::repr_html(chart)