From 1602b78e04870c4601990554907437a74d2339f5 Mon Sep 17 00:00:00 2001 From: Cam Saul <1455846+camsaul@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:04:34 -0700 Subject: [PATCH] Bump dependencies (#176) * Bump dependencies * Don't upgrade CodeCov * Don't upgrade Honey SQL yet until we fix https://github.com/seancorfield/honeysql/issues/537 --- .github/workflows/deploy.yml | 2 +- .github/workflows/tests.yml | 16 ++++++++-------- .gitignore | 1 + deps.edn | 26 +++++++++++++------------- test/toucan2/delete_test.clj | 3 +++ 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9e852fca..5045a94c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-20.04 environment: Deployment steps: - - uses: actions/checkout@v4.1.0 + - uses: actions/checkout@v4.1.7 with: fetch-depth: 0 - name: Setup Java & Clojure diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 55a9ee63..8a65b86c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,7 @@ jobs: CLJ_KONDO_VERSION: "2023.09.07" DOWNLOAD_URL: https://github.com/clj-kondo/clj-kondo/releases/download steps: - - uses: actions/checkout@v4.1.0 + - uses: actions/checkout@v4.1.7 - name: Setup Java & Clojure uses: ./.github/actions/setup with: @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 10 steps: - - uses: actions/checkout@v4.1.0 + - uses: actions/checkout@v4.1.7 - uses: harmon758/postgresql-action@v1 with: postgresql version: 14 @@ -79,7 +79,7 @@ jobs: MYSQL_USER: root MYSQL_ALLOW_EMPTY_PASSWORD: yes steps: - - uses: actions/checkout@v4.1.0 + - uses: actions/checkout@v4.1.7 - name: Setup Java & Clojure uses: ./.github/actions/setup with: @@ -93,7 +93,7 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 10 steps: - - uses: actions/checkout@v4.1.0 + - uses: actions/checkout@v4.1.7 - name: Setup Java & Clojure uses: ./.github/actions/setup with: @@ -106,7 +106,7 @@ jobs: whitespace-linter: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v4.1.0 + - uses: actions/checkout@v4.1.7 - name: Setup Java & Clojure uses: ./.github/actions/setup with: @@ -117,7 +117,7 @@ jobs: check: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v4.1.0 + - uses: actions/checkout@v4.1.7 - name: Setup Java & Clojure uses: ./.github/actions/setup with: @@ -131,7 +131,7 @@ jobs: codecov: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v4.1.0 + - uses: actions/checkout@v4.1.7 - name: Setup Java & Clojure uses: ./.github/actions/setup with: @@ -146,7 +146,7 @@ jobs: codespell: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v4.1.0 + - uses: actions/checkout@v4.1.7 - uses: codespell-project/actions-codespell@v2 with: ignore_words_file: .codespellignore diff --git a/.gitignore b/.gitignore index 76645b21..4c817292 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.class *.jar +*.~undo-tree~ .\#* .cache .cpcache diff --git a/deps.edn b/deps.edn index 53805185..ff76bb66 100644 --- a/deps.edn +++ b/deps.edn @@ -4,31 +4,31 @@ :deps {better-cond/better-cond {:mvn/version "2.1.5"} camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.3"} - com.github.seancorfield/honeysql {:mvn/version "2.4.1066"} - com.github.seancorfield/next.jdbc {:mvn/version "1.3.894"} + com.github.seancorfield/honeysql {:mvn/version "2.4.1066"} ; don't upgrade yet because of https://github.com/seancorfield/honeysql/issues/537 + com.github.seancorfield/next.jdbc {:mvn/version "1.3.939"} environ/environ {:mvn/version "1.2.0"} - methodical/methodical {:mvn/version "0.15.1"} + methodical/methodical {:mvn/version "1.0.123"} mvxcvi/puget {:mvn/version "1.3.4"} - org.clojure/tools.logging {:mvn/version "1.2.4"} - org.clojure/tools.trace {:mvn/version "0.7.11"} - potemkin/potemkin {:mvn/version "0.4.6"} + org.clojure/tools.logging {:mvn/version "1.3.0"} + org.clojure/tools.trace {:mvn/version "0.8.0"} + potemkin/potemkin {:mvn/version "0.4.7"} pretty/pretty {:mvn/version "1.0.5"}} :aliases {:dev {:extra-deps - {com.h2database/h2 {:mvn/version "2.2.224"} + {com.h2database/h2 {:mvn/version "2.3.232"} eftest/eftest {:mvn/version "0.6.0"} io.github.camsaul/humane-are {:mvn/version "1.0.2"} - org.clojure/java.classpath {:mvn/version "1.0.0"} - org.clojure/math.combinatorics {:mvn/version "0.2.0"} - org.clojure/tools.namespace {:mvn/version "1.4.4"} + org.clojure/java.classpath {:mvn/version "1.1.0"} + org.clojure/math.combinatorics {:mvn/version "0.3.0"} + org.clojure/tools.namespace {:mvn/version "1.5.0"} ;; Don't upgrade to 3.x yet. It only returns the first generated key when inserting multiple rows. So keep using v2 ;; until we decide how to work around it or they fix it. See ;; ;; https://mariadb.com/kb/en/about-mariadb-connector-j/#generated-keys-limitation org.mariadb.jdbc/mariadb-java-client {:mvn/version "2.7.8"} - org.postgresql/postgresql {:mvn/version "42.6.0"} + org.postgresql/postgresql {:mvn/version "42.7.4"} pjstadig/humane-test-output {:mvn/version "0.11.0"}} :extra-paths @@ -48,7 +48,7 @@ ;; clojure -M:check :check {:extra-deps {athos/clj-check {:git/url "https://github.com/athos/clj-check.git" - :sha "518d5a1cbfcd7c952f548e6dbfcb9a4a5faf9062"}} + :sha "d997df866b2a04b7ce7b17533093ee0a2e2cb729"}} :main-opts ["-m" "clj-check.check"]} ;; clj -T:whitespace-linter @@ -130,6 +130,6 @@ ;; clojure -T:build :build - {:deps {io.github.clojure/tools.build {:git/tag "v0.9.6" :git/sha "8e78bcc"} + {:deps {io.github.clojure/tools.build {:git/tag "v0.10.5" :git/sha "2a21b7a"} slipset/deps-deploy {:mvn/version "0.2.2"}} :ns-default build}}} diff --git a/test/toucan2/delete_test.clj b/test/toucan2/delete_test.clj index 3dca363d..3b362344 100644 --- a/test/toucan2/delete_test.clj +++ b/test/toucan2/delete_test.clj @@ -3,6 +3,7 @@ [clojure.test :refer :all] [methodical.core :as m] [toucan2.connection :as conn] + [toucan2.core] [toucan2.delete :as delete] [toucan2.model :as model] [toucan2.pipeline :as pipeline] @@ -12,6 +13,8 @@ [toucan2.tools.compile :as tools.compile] [toucan2.tools.named-query :as tools.named-query])) +(comment toucan2.core/keep-me) + (deftest ^:parallel parse-args-test ;; these are basically the same as the select args so we don't need a ton of coverage here. (are [args expected] (= expected