diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 752aa1b..aea5ec0 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -37,7 +37,7 @@ jobs: key: gitlibs-${{ hashFiles('deps.edn') }} - name: Prepare dependencies - run: clojure -M:test:clj-test:cljs-test:readme-test -P + run: clojure -P -M:test:clj-test:cljs-test - name: Run Clojure tests run: clojure -X:test:clj-test @@ -45,5 +45,3 @@ jobs: - name: Run ClojureScript tests run: clojure -M:test:cljs-test - - name: Run README tests - run: clojure -M:test:readme-test diff --git a/bb.edn b/bb.edn index 41ba976..10e0a79 100644 --- a/bb.edn +++ b/bb.edn @@ -4,7 +4,7 @@ test {:doc "Run test" :task (run '-test)} - -test {:depends [test:clj test:cljs test:readme]} + -test {:depends [test:clj test:cljs]} test:clj {:doc "Run Clojure test" :task (clojure "-X:test:clj-test")} @@ -12,9 +12,6 @@ test:cljs {:doc "Run ClojureScript test" :task (clojure "-M:test:cljs-test")} - test:readme {:doc "Run README test" - :task (clojure "-M:test:readme-test")} - lint {:doc "Run Clojure linters" :task (shell "clj-kondo --lint src test")} diff --git a/deps-lock.json b/deps-lock.json index 38397a0..7508974 100644 --- a/deps-lock.json +++ b/deps-lock.json @@ -19,9 +19,9 @@ { "lib": "io.github.inferenceql/inferenceql.inference", "url": "https://github.com/inferenceql/inferenceql.inference.git", - "rev": "40e77dedf680b7936ce988b66186a86f5c4db6a5", + "rev": "c3cef474ba964a37fc2e5ff667055f5b77e12c45", "git-dir": "https/github.com/inferenceql/inferenceql.inference", - "hash": "sha256-UtH6AbOhOXzD0hhIYJRrS8k2NQwPj3ZzZp3HNUvevME=" + "hash": "sha256-gjVmfbcAEeb0uHJTOUrFasDhZY+c4wI8M5W+itJynz4=" }, { "lib": "io.github.probcomp/metaprob", @@ -72,6 +72,16 @@ "mvn-repo": "https://repo.clojars.org/", "hash": "sha256-JezOPysastKFP6SSVze/8ZvwYnbr/uu5PhHvdTc7ea8=" }, + { + "mvn-path": "cheshire/cheshire/5.10.0/cheshire-5.10.0.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-l3PHeIYLYeUXTVeUfJQIGwaJY6aaL7ABmhGpGuN9l8w=" + }, + { + "mvn-path": "clj-commons/clj-yaml/0.7.106/clj-yaml-0.7.106.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-PjA1AYpQJF0qH1GABiXyETqcUo+e9/ilsRKKFLkggOc=" + }, { "mvn-path": "clj-http/clj-http/3.12.1/clj-http-3.12.1.jar", "mvn-repo": "https://repo.clojars.org/", @@ -122,6 +132,16 @@ "mvn-repo": "https://repo.clojars.org/", "hash": "sha256-0d3aw7XyFzjretL0RFl7dhtTIUgYfOWQsG+56LHnqgw=" }, + { + "mvn-path": "com/clojure-goes-fast/clj-async-profiler/1.2.0/clj-async-profiler-1.2.0.jar", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-+EKRhsxJKaGNPLKlrz9UG0QLMuU34Ed4VkSRBINX2FQ=" + }, + { + "mvn-path": "com/clojure-goes-fast/clj-async-profiler/1.2.0/clj-async-profiler-1.2.0.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-OZif4zTZYVoDj6UC8jRyaviBTyMlitPTxHdSmEeV0t8=" + }, { "mvn-path": "com/cognitect/aws/api/0.8.612/api-0.8.612.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -492,6 +512,16 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" }, + { + "mvn-path": "criterium/criterium/0.4.6/criterium-0.4.6.jar", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-r14UbxCZd9XNA1vAzjlOySebIySQBp8ErsaO5Mi8FY4=" + }, + { + "mvn-path": "criterium/criterium/0.4.6/criterium-0.4.6.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-Lb9Ysv6gyT1w02RS6Rf+soFUNpnPGzs+IrGl6cpol0k=" + }, { "mvn-path": "crypto-equality/crypto-equality/1.0.0/crypto-equality-1.0.0.jar", "mvn-repo": "https://repo.clojars.org/", @@ -1193,14 +1223,14 @@ "hash": "sha256-IMRaGr7b2L4grvk2BQrjGgjBZ0CzL4dAuIOM3pb/y4o=" }, { - "mvn-path": "org/clojure/clojurescript/1.11.60/clojurescript-1.11.60.jar", + "mvn-path": "org/clojure/clojurescript/1.11.132/clojurescript-1.11.132.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", - "hash": "sha256-FM5386CoVOIkJVzrFjX2ybcYFPy5f93w4TVNohrklYA=" + "hash": "sha256-NlfC1dt+qOpGzuAe/wNDdxUBqdSILGBiJTX0ZjUpAVE=" }, { - "mvn-path": "org/clojure/clojurescript/1.11.60/clojurescript-1.11.60.pom", + "mvn-path": "org/clojure/clojurescript/1.11.132/clojurescript-1.11.132.pom", "mvn-repo": "https://repo.maven.apache.org/maven2/", - "hash": "sha256-/mebfvBIpWG2IeS6+PyjjUhC8szVvb8T4+FZ7Ja8LoI=" + "hash": "sha256-P/01QSpDDIx0FX5fIzu6zESw+qfVcPLeaWAbFvLsalc=" }, { "mvn-path": "org/clojure/core.async/1.6.673/core.async-1.6.673.jar", @@ -1313,24 +1343,24 @@ "hash": "sha256-r27O5bMSGWJukB2Gja+zp/raf7xHaOrvDnvngPOtstI=" }, { - "mvn-path": "org/clojure/google-closure-library-third-party/0.0-20211011-0726fdeb/google-closure-library-third-party-0.0-20211011-0726fdeb.jar", + "mvn-path": "org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", - "hash": "sha256-/FNsq/SBL0h93J70nHuIdoznIm4DoAbBgrpJ6ykgiFo=" + "hash": "sha256-akOBHiEML+UDsZZeJxm3h7gqfNbVIB0wN3/37BbZaUo=" }, { - "mvn-path": "org/clojure/google-closure-library-third-party/0.0-20211011-0726fdeb/google-closure-library-third-party-0.0-20211011-0726fdeb.pom", + "mvn-path": "org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541.pom", "mvn-repo": "https://repo.maven.apache.org/maven2/", - "hash": "sha256-TJdXE8WPrjKHZxAbUWZsk8k5/8uDLiwQ+xjEUOPGQmA=" + "hash": "sha256-dhVz7jVV7/WzITGoKz7ul+l3tR+XvnR6TKhDwupC8FU=" }, { - "mvn-path": "org/clojure/google-closure-library/0.0-20211011-0726fdeb/google-closure-library-0.0-20211011-0726fdeb.jar", + "mvn-path": "org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", - "hash": "sha256-KjPFSw8nqZPRjcBeGXuRRyw8kIIA4NDYISm94QexZOI=" + "hash": "sha256-FIWqledzD4Ssu6EbhlGQxTi4j0HwEHtH9S/dhThNQUs=" }, { - "mvn-path": "org/clojure/google-closure-library/0.0-20211011-0726fdeb/google-closure-library-0.0-20211011-0726fdeb.pom", + "mvn-path": "org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541.pom", "mvn-repo": "https://repo.maven.apache.org/maven2/", - "hash": "sha256-xLwwLiNcKsr4EXURo9sOO50S6mqBKdlauJJ7m6iIYJg=" + "hash": "sha256-Yd9uaKawYf1aMAjhcDnEEH2qUnVQs9VYSLWkgQ9idXU=" }, { "mvn-path": "org/clojure/java.classpath/1.0.0/java.classpath-1.0.0.jar", @@ -1747,6 +1777,36 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-g2Bpyp6O48VuSDdiItopEmPxN70/0W2E/dR+/MPyhuI=" }, + { + "mvn-path": "org/junit/jupiter/junit-jupiter-api/5.7.1/junit-jupiter-api-5.7.1.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-1Vvisj13FDKXB3IEMgey5mpnJK4CvVGStyFuS3AbxiM=" + }, + { + "mvn-path": "org/junit/jupiter/junit-jupiter-engine/5.7.1/junit-jupiter-engine-5.7.1.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-gRF+OjoCDf3W8wkcXseU0stJhAcxrPQogxxWmQEvTLs=" + }, + { + "mvn-path": "org/junit/jupiter/junit-jupiter-params/5.7.1/junit-jupiter-params-5.7.1.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-UIPD5bw9OhjVY6M0fVPi3f35ONdh60TbsL9PQgX+6Sw=" + }, + { + "mvn-path": "org/junit/jupiter/junit-jupiter/5.7.1/junit-jupiter-5.7.1.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-YLUGfK3Mb/tfqS6OJJiKgMbDYEaPJj0mmLKIHI4PfJE=" + }, + { + "mvn-path": "org/junit/platform/junit-platform-commons/1.7.1/junit-platform-commons-1.7.1.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-t8GENMTUsn5yO9SKr5ercK7IwMra1MFTkvvdFEykpQo=" + }, + { + "mvn-path": "org/junit/platform/junit-platform-engine/1.7.1/junit-platform-engine-1.7.1.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-dmAvWZVKo9+mjjHIDKibb7ouoAG0+wbLUfoV6tfIWjA=" + }, { "mvn-path": "org/msgpack/msgpack/0.6.12/msgpack-0.6.12.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -1902,6 +1962,11 @@ "mvn-repo": "https://repo.clojars.org/", "hash": "sha256-SZCg3bNUDE1Ed6GtqP1mP62RSRScmaYGL7/XSKXwGJo=" }, + { + "mvn-path": "ring/ring-codec/1.1.2/ring-codec-1.1.2.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-sl/LVYL/wFWem+BnzQXP13SAm5IocZz8HqVojsnKH+c=" + }, { "mvn-path": "ring/ring-codec/1.1.3/ring-codec-1.1.3.jar", "mvn-repo": "https://repo.clojars.org/", @@ -1942,16 +2007,6 @@ "mvn-repo": "https://repo.clojars.org/", "hash": "sha256-YOb6wGNeeSRrV7sS81H2n1i8/lJkmD4YnpB4EDIZ40Y=" }, - { - "mvn-path": "seancorfield/readme/1.0.16/readme-1.0.16.jar", - "mvn-repo": "https://repo.clojars.org/", - "hash": "sha256-IYC2iljwPXh0P7YOavDuyNBYEl8MSO3opSj075/q9Io=" - }, - { - "mvn-path": "seancorfield/readme/1.0.16/readme-1.0.16.pom", - "mvn-repo": "https://repo.clojars.org/", - "hash": "sha256-vyliKZeFUvGeNIEt4X7mY2HQNGLCZxZBk45WBGigeUo=" - }, { "mvn-path": "slingshot/slingshot/0.12.2/slingshot-0.12.2.jar", "mvn-repo": "https://repo.clojars.org/", diff --git a/deps.edn b/deps.edn index 0bbb568..13c6da7 100644 --- a/deps.edn +++ b/deps.edn @@ -5,7 +5,7 @@ metosin/muuntaja {:mvn/version "0.6.8"} net.cgrand/macrovich {:mvn/version "0.2.1"} net.cgrand/xforms {:mvn/version "0.19.2"} - io.github.inferenceql/inferenceql.inference {:git/sha "40e77dedf680b7936ce988b66186a86f5c4db6a5"} + io.github.inferenceql/inferenceql.inference {:git/sha "c3cef474ba964a37fc2e5ff667055f5b77e12c45"} io.github.clojure/tools.build {:git/sha "8e78bccc35116f6b6fc0bf0c125dba8b8db8da6b"} org.babashka/sci {:mvn/version "0.3.32"} org.clojure/clojure {:mvn/version "1.11.1"} @@ -32,8 +32,6 @@ :exec-fn cognitect.test-runner.api/test} :cljs-test {:extra-deps {olical/cljs-test-runner {:mvn/version "3.8.0"}} :main-opts ["--main" "cljs-test-runner.main"]} - :readme-test {:extra-deps {seancorfield/readme {:mvn/version "1.0.16"}} - :main-opts ["--main" "seancorfield.readme"]} :js-build {:main-opts ["--main" "cljs.main" "--optimizations" "advanced" "--compile" "inferenceql.query.js"]} diff --git a/package.json b/package.json index 6dd124c..7ea8601 100644 --- a/package.json +++ b/package.json @@ -1,29 +1,29 @@ - { - "name": "inferenceql.query", - "version": "1.0.0", - "description": "![tests](https://github.com/OpenIQL/inferenceql.query/workflows/tests/badge.svg) ![linter](https://github.com/OpenIQL/inferenceql.query/workflows/linter/badge.svg)", - "main": "index.js", - "directories": { - "doc": "docs", - "test": "test" - }, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/InferenceQL/inferenceql.query.git" - }, - "keywords": [], - "author": "", - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/InferenceQL/inferenceql.query/issues" - }, - "homepage": "https://github.com/InferenceQL/inferenceql.query#readme", - "devDependencies": { - "shadow-cljs": "^2.27.5" - }, - "dependencies": { - } - } +{ + "name": "inferenceql.query", + "version": "1.0.0", + "description": "![tests](https://github.com/OpenIQL/inferenceql.query/workflows/tests/badge.svg) ![linter](https://github.com/OpenIQL/inferenceql.query/workflows/linter/badge.svg)", + "main": "index.js", + "directories": { + "doc": "docs", + "test": "test" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/InferenceQL/inferenceql.query.git" + }, + "keywords": [], + "author": "", + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/InferenceQL/inferenceql.query/issues" + }, + "homepage": "https://github.com/InferenceQL/inferenceql.query#readme", + "devDependencies": { + "shadow-cljs": "^2.27.5" + }, + "dependencies": { + } +}