From 6fa6421038400d12a15e48271d2443a9126db7cd Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 3 Dec 2023 11:11:42 -0600 Subject: [PATCH 1/9] a11y prs --- jupyak_config.toml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 jupyak_config.toml diff --git a/jupyak_config.toml b/jupyak_config.toml new file mode 100644 index 0000000..6f8c04c --- /dev/null +++ b/jupyak_config.toml @@ -0,0 +1,13 @@ +[lite] +gist = "7232671f04a5de8f1ce4b810f5ea8a3a" + +[repos.jupyterlab.github] +merge_strategy = "ours" +merge_with = [ + "pull/14575", + "pull/14597", + "pull/14766", + "pull/14854", + "pull/15222", + "pull/15347" +] From 6b8fd00b11c219a92536a579b9e9299de320116d Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 3 Dec 2023 11:16:54 -0600 Subject: [PATCH 2/9] use a dangling lumino pr --- jupyak_config.toml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jupyak_config.toml b/jupyak_config.toml index 6f8c04c..230fd53 100644 --- a/jupyak_config.toml +++ b/jupyak_config.toml @@ -1,9 +1,13 @@ [lite] gist = "7232671f04a5de8f1ce4b810f5ea8a3a" -[repos.jupyterlab.github] -merge_strategy = "ours" -merge_with = [ +[repos] +lumino.github.merge_with = [ + "pull/655", +] + +jupyterlab.github.merge_strategy = "ours" +jupyterlab.github.merge_with = [ "pull/14575", "pull/14597", "pull/14766", From 713edf94301866bdff4e1e3da27d528cdd8169a6 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 3 Dec 2023 14:43:09 -0600 Subject: [PATCH 3/9] try theirs --- jupyak_config.toml | 3 ++- src/jupyak/tasks/_git.ipynb | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/jupyak_config.toml b/jupyak_config.toml index 230fd53..4cb841f 100644 --- a/jupyak_config.toml +++ b/jupyak_config.toml @@ -6,7 +6,8 @@ lumino.github.merge_with = [ "pull/655", ] -jupyterlab.github.merge_strategy = "ours" +jupyterlab.github.merge_strategy = "ort" +jupyterlab.github.merge_options = ["theirs"] jupyterlab.github.merge_with = [ "pull/14575", "pull/14597", diff --git a/src/jupyak/tasks/_git.ipynb b/src/jupyak/tasks/_git.ipynb index abdb961..3595ce0 100644 --- a/src/jupyak/tasks/_git.ipynb +++ b/src/jupyak/tasks/_git.ipynb @@ -208,6 +208,11 @@ "\n", " yield dict(\n", " name=f\"{name}:checkout\",\n", + " uptodate=[\n", + " doit.tools.config_changed(\n", + " {\"s\": merge_strategy, \"x\": merge_options, \"refs\": local_refs}\n", + " )\n", + " ],\n", " actions=actions,\n", " file_dep=file_dep,\n", " targets=targets,\n", From 6b6b866d03734ddf06f4b80f18910f7d015c605d Mon Sep 17 00:00:00 2001 From: Tony Fast Date: Mon, 4 Dec 2023 10:39:20 -0800 Subject: [PATCH 4/9] Update jupyak_config.toml --- jupyak_config.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/jupyak_config.toml b/jupyak_config.toml index 4cb841f..860ff94 100644 --- a/jupyak_config.toml +++ b/jupyak_config.toml @@ -4,6 +4,7 @@ gist = "7232671f04a5de8f1ce4b810f5ea8a3a" [repos] lumino.github.merge_with = [ "pull/655", + "pull/627", ] jupyterlab.github.merge_strategy = "ort" From 8a92d617be394d065bea41766f00cdcf438e54a4 Mon Sep 17 00:00:00 2001 From: Tony Fast Date: Mon, 4 Dec 2023 10:39:26 -0800 Subject: [PATCH 5/9] Update jupyak_config.toml --- jupyak_config.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jupyak_config.toml b/jupyak_config.toml index 860ff94..a9f1caf 100644 --- a/jupyak_config.toml +++ b/jupyak_config.toml @@ -15,5 +15,6 @@ jupyterlab.github.merge_with = [ "pull/14766", "pull/14854", "pull/15222", - "pull/15347" + "pull/15347", + "pull/15048", ] From 9572c2d8fbe68995659afec2bc5924028781dfad Mon Sep 17 00:00:00 2001 From: Tony Fast Date: Tue, 5 Dec 2023 10:42:36 -0800 Subject: [PATCH 6/9] Update jupyak_config.toml --- jupyak_config.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/jupyak_config.toml b/jupyak_config.toml index a9f1caf..53449cb 100644 --- a/jupyak_config.toml +++ b/jupyak_config.toml @@ -4,7 +4,6 @@ gist = "7232671f04a5de8f1ce4b810f5ea8a3a" [repos] lumino.github.merge_with = [ "pull/655", - "pull/627", ] jupyterlab.github.merge_strategy = "ort" From ef66aedbcc18906f6f7afd8c6bfa50429f03ff4d Mon Sep 17 00:00:00 2001 From: Tony Fast Date: Wed, 6 Dec 2023 09:22:18 -0800 Subject: [PATCH 7/9] kick a build space is UI --- jupyak_config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyak_config.toml b/jupyak_config.toml index 53449cb..6d433d9 100644 --- a/jupyak_config.toml +++ b/jupyak_config.toml @@ -16,4 +16,4 @@ jupyterlab.github.merge_with = [ "pull/15222", "pull/15347", "pull/15048", -] +] From 76a9964548da4c7906a284273502eb0c84cf380d Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Wed, 13 Dec 2023 10:39:49 -0600 Subject: [PATCH 8/9] yank gist --- jupyak_config.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/jupyak_config.toml b/jupyak_config.toml index 6d433d9..46865c6 100644 --- a/jupyak_config.toml +++ b/jupyak_config.toml @@ -1,6 +1,3 @@ -[lite] -gist = "7232671f04a5de8f1ce4b810f5ea8a3a" - [repos] lumino.github.merge_with = [ "pull/655", From 78a5e65b163e96bac7debc890ff27991260f010f Mon Sep 17 00:00:00 2001 From: Tony Fast Date: Tue, 16 Jan 2024 16:20:44 -0800 Subject: [PATCH 9/9] Update jupyak_config.toml update configuration based on https://github.com/t03857785/jupyterlab/issues/12 --- jupyak_config.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jupyak_config.toml b/jupyak_config.toml index 46865c6..6afb3b9 100644 --- a/jupyak_config.toml +++ b/jupyak_config.toml @@ -1,16 +1,16 @@ [repos] -lumino.github.merge_with = [ +lumino.github.merge_with = [ + "pull/633", + "pull/637", "pull/655", + "pull/666" ] jupyterlab.github.merge_strategy = "ort" jupyterlab.github.merge_options = ["theirs"] jupyterlab.github.merge_with = [ - "pull/14575", - "pull/14597", - "pull/14766", - "pull/14854", - "pull/15222", - "pull/15347", "pull/15048", + "pull/15155", + "pull/15347", + "pull/15554" ]