From 050f62e6b67acdeca0c9463c12ffd66e46107005 Mon Sep 17 00:00:00 2001 From: lread Date: Sat, 12 Jul 2025 12:07:17 -0400 Subject: [PATCH 1/2] test libs: depot: re-enable Broken tests fixed: https://github.com/Olical/depot/issues/57 --- README.adoc | 3 +-- script/test_libs.clj | 31 ++++--------------------------- 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/README.adoc b/README.adoc index e3268b1..b96a0b1 100644 --- a/README.adoc +++ b/README.adoc @@ -57,8 +57,7 @@ Some projects using rewrite-clj v1 * https://github.com/greglook/cljstyle[cljstyle] {canary-tested} - A tool for formatting Clojure code * https://github.com/clojure-lsp/clojure-lsp[clojure-lsp] {canary-tested} - Language Server (LSP) for Clojure * https://github.com/bhauman/clojure-mcp[clojure-mcp] {canary-tested} - REPL-Driven Development with AI Assistance -// depot tests are currently broken -* https://github.com/Olical/depot[depot] {not-canary-tested} - Find newer versions of your dependencies in your deps.edn file +* https://github.com/Olical/depot[depot] {canary-tested} - Find newer versions of your dependencies in your deps.edn file // duck-repled repo is not version tagged: * https://github.com/mauricioszabo/duck-repled[duck-repled] {not-canary-tested} - Transform your REPL interation into Pathom queries * https://github.com/jonase/kibit[kibit] {canary-tested} - There's a function for that! diff --git a/script/test_libs.clj b/script/test_libs.clj index ea344a1..89c4cf8 100755 --- a/script/test_libs.clj +++ b/script/test_libs.clj @@ -136,17 +136,6 @@ :removals #{'rewrite-clj 'rewrite-clj/rewrite-clj} :additions [['rewrite-clj/rewrite-clj rewrite-clj-version]]})) -;; needed by depot patch, we'll see if it still needed after depot fixes its tests -#_(defn- replace-in-file [fname match replacement] - (let [orig-filename (str fname ".orig") - content (slurp fname)] - (fs/copy fname orig-filename) - (status/line :detail "- hacking %s" fname) - (let [new-content (string/replace content match replacement)] - (if (= new-content content) - (throw (ex-info (format "hacking file failed: %s" fname) {})) - (spit fname new-content))))) - (defn- show-patch-diff [{:keys [home-dir]}] (let [{:keys [exit]} (shcmd {:dir home-dir :continue true} "git --no-pager diff --exit-code")] @@ -175,17 +164,6 @@ (defn clojure-lsp-deps [lib-opts] (cli-deps-tree (update lib-opts :home-dir #(str (fs/file % "lib"))))) -;; -;; depot -;; -;; We'll see if this custom path is needed after next release of depot that fixes its tests -#_(defn depot-patch [{:keys [home-dir] :as lib}] - (deps-edn-v1-patch lib) - (status/line :detail "=> depot uses but does not require rewrite-clj.node, need to adjust for rewrite-clj v1") - (replace-in-file (str (fs/file home-dir "src/depot/zip.clj")) - "[rewrite-clj.zip :as rzip]" - "[rewrite-clj.zip :as rzip] [rewrite-clj.node]")) - ;; ;; lein ancient ;; @@ -345,16 +323,15 @@ :patch-fn deps-edn-v1-patch :show-deps-fn cli-deps-tree :test-cmds ["clojure -M:test"]} - #_{:name "depot" + {:name "depot" :platforms [:clj] - :note "Depot tests are currently broken, re-enable when they are fixed" - :version "2.4.0" + :version "2.4.1" :github-release {:repo "Olical/depot" :via :tag :version-prefix "v"} - :patch-fn depot-patch + :patch-fn deps-edn-v1-patch :show-deps-fn cli-deps-tree - :test-cmds ["bin/kaocha --reporter documentation"]} + :test-cmds ["clojure -M:dev:test"]} {:name "kibit" :platforms [:clj] :version "0.1.11" From 4bd3b032bd994f3c36201f3915208448301aa903 Mon Sep 17 00:00:00 2001 From: lread Date: Sat, 12 Jul 2025 12:11:47 -0400 Subject: [PATCH 2/2] test libs: bump clojure-mcp --- script/test_libs.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/test_libs.clj b/script/test_libs.clj index 89c4cf8..8df344a 100755 --- a/script/test_libs.clj +++ b/script/test_libs.clj @@ -316,7 +316,7 @@ :test-cmds ["bb test"]} {:name "clojure-mcp" :platforms [:clj] - :version "0.1.6-alpha" + :version "0.1.7-alpha-pre" :github-release {:repo "bhauman/clojure-mcp" :via :tag :version-prefix "v"}