From 5571c651e479cdf2a6b988cc1b8e731bb027ddc0 Mon Sep 17 00:00:00 2001 From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com> Date: Sat, 8 Jun 2024 16:42:59 -0700 Subject: [PATCH] fix: Fix intra-prql crate dependency specification (#4561) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- CHANGELOG.md | 5 ++++ Cargo.lock | 28 +++++++++---------- Cargo.toml | 2 +- lutra/lutra/Cargo.toml | 2 +- prqlc/bindings/elixir/native/prql/Cargo.toml | 2 +- prqlc/bindings/js/package-lock.json | 4 +-- prqlc/bindings/js/package.json | 2 +- prqlc/prql-compiler-macros/Cargo.toml | 2 +- prqlc/prql-compiler/Cargo.toml | 2 +- prqlc/prqlc-parser/Cargo.toml | 2 +- prqlc/prqlc/Cargo.toml | 4 +-- prqlc/prqlc/src/cli/docs_generator.rs | 2 +- prqlc/prqlc/tests/integration/sql.rs | 4 +-- web/book/src/project/target.md | 2 +- ...on__book__project__target__version__1.snap | 2 +- web/playground/package-lock.json | 6 ++-- web/playground/package.json | 2 +- 17 files changed, 39 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a173a048bb35..6028bdd3cc41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # PRQL Changelog +## 0.12.1 — 2024-06-09 + +0.12.1 is a tiny hotfix release which fixes how intra-prql crate dependencies +were specified. + ## 0.12.0 — 2024-06-08 0.12.0 contains a few months of smaller features. Our focus has been on diff --git a/Cargo.lock b/Cargo.lock index a8eb1816aaee..d072133a5333 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "compile-files" -version = "0.12.0" +version = "0.12.1" dependencies = [ "prqlc", ] @@ -2268,7 +2268,7 @@ dependencies = [ [[package]] name = "lutra" -version = "0.12.0" +version = "0.12.1" dependencies = [ "anyhow", "arrow 49.0.0", @@ -2285,7 +2285,7 @@ dependencies = [ [[package]] name = "lutra-python" -version = "0.12.0" +version = "0.12.1" dependencies = [ "arrow 49.0.0", "itertools 0.12.1", @@ -2346,7 +2346,7 @@ dependencies = [ [[package]] name = "mdbook-prql" -version = "0.12.0" +version = "0.12.1" dependencies = [ "ansi-to-html", "anstream", @@ -3016,7 +3016,7 @@ dependencies = [ [[package]] name = "prql" -version = "0.12.0" +version = "0.12.1" dependencies = [ "prqlc", "rustler", @@ -3024,14 +3024,14 @@ dependencies = [ [[package]] name = "prql-compiler" -version = "0.12.0" +version = "0.12.1" dependencies = [ "prqlc", ] [[package]] name = "prql-compiler-macros" -version = "0.12.0" +version = "0.12.1" dependencies = [ "prqlc", "syn 2.0.66", @@ -3039,7 +3039,7 @@ dependencies = [ [[package]] name = "prql-java" -version = "0.12.0" +version = "0.12.1" dependencies = [ "jni", "prqlc", @@ -3047,7 +3047,7 @@ dependencies = [ [[package]] name = "prql-js" -version = "0.12.0" +version = "0.12.1" dependencies = [ "console_error_panic_hook", "prqlc", @@ -3057,7 +3057,7 @@ dependencies = [ [[package]] name = "prqlc" -version = "0.12.0" +version = "0.12.1" dependencies = [ "anstream", "anyhow", @@ -3114,7 +3114,7 @@ dependencies = [ [[package]] name = "prqlc-ast" -version = "0.12.0" +version = "0.12.1" dependencies = [ "chumsky", "enum-as-inner", @@ -3129,7 +3129,7 @@ dependencies = [ [[package]] name = "prqlc-c" -version = "0.12.0" +version = "0.12.1" dependencies = [ "libc", "prqlc", @@ -3138,7 +3138,7 @@ dependencies = [ [[package]] name = "prqlc-parser" -version = "0.12.0" +version = "0.12.1" dependencies = [ "chumsky", "insta", @@ -3153,7 +3153,7 @@ dependencies = [ [[package]] name = "prqlc-python" -version = "0.12.0" +version = "0.12.1" dependencies = [ "insta", "prqlc", diff --git a/Cargo.toml b/Cargo.toml index 454926f7aa5c..db732ffdecb5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ repository = "https://github.com/PRQL/prql" # This isn't tested since `cargo-msrv` doesn't support workspaces; instead we # test `metadata.msrv` in `prqlc` rust-version = "1.70.0" -version = "0.12.0" +version = "0.12.1" [profile.release] # Optimize for binary size in releases of all crates, diff --git a/lutra/lutra/Cargo.toml b/lutra/lutra/Cargo.toml index 1442fcfb1624..1f0f05290936 100644 --- a/lutra/lutra/Cargo.toml +++ b/lutra/lutra/Cargo.toml @@ -30,7 +30,7 @@ connector_arrow = {version = "0.4.1", features = ["src_sqlite"]} env_logger = "0.10.2" itertools = {workspace = true} log = {workspace = true} -prqlc = {path = "../../prqlc/prqlc", version = "0.12.0", default-features = false} +prqlc = {path = "../../prqlc/prqlc", version = "0.12.1", default-features = false} rusqlite = {version = "0.31.0", features = ["bundled"]} walkdir = "2.5.0" diff --git a/prqlc/bindings/elixir/native/prql/Cargo.toml b/prqlc/bindings/elixir/native/prql/Cargo.toml index a8d0940e150a..0632e69a5083 100644 --- a/prqlc/bindings/elixir/native/prql/Cargo.toml +++ b/prqlc/bindings/elixir/native/prql/Cargo.toml @@ -20,5 +20,5 @@ doc = false # See Readme for details on Mac [target.'cfg(not(any(target_family="wasm", target_os = "macos")))'.dependencies] -prqlc = {path = "../../../../prqlc", default-features = false, version = "0.12.0" } +prqlc = {path = "../../../../prqlc", default-features = false, version = "0.12.1" } rustler = "0.32.1" diff --git a/prqlc/bindings/js/package-lock.json b/prqlc/bindings/js/package-lock.json index 503f2d706bef..b407c827fb6d 100644 --- a/prqlc/bindings/js/package-lock.json +++ b/prqlc/bindings/js/package-lock.json @@ -1,12 +1,12 @@ { "name": "prql-js", - "version": "0.12.0", + "version": "0.12.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "prql-js", - "version": "0.12.0", + "version": "0.12.1", "license": "Apache-2.0", "devDependencies": { "chai": "^5.0.0", diff --git a/prqlc/bindings/js/package.json b/prqlc/bindings/js/package.json index 21740970c689..4893caa56b1c 100644 --- a/prqlc/bindings/js/package.json +++ b/prqlc/bindings/js/package.json @@ -35,5 +35,5 @@ "test": "mocha tests" }, "types": "dist/node/prql_js.d.ts", - "version": "0.12.0" + "version": "0.12.1" } diff --git a/prqlc/prql-compiler-macros/Cargo.toml b/prqlc/prql-compiler-macros/Cargo.toml index 937ec1640e14..c424e45a5398 100644 --- a/prqlc/prql-compiler-macros/Cargo.toml +++ b/prqlc/prql-compiler-macros/Cargo.toml @@ -14,7 +14,7 @@ proc_macro = true test = false [dependencies] -prqlc = {path = "../prqlc", default-features = false, version = "0.12.0" } +prqlc = {path = "../prqlc", default-features = false, version = "0.12.1" } syn = "2.0.66" [package.metadata.release] diff --git a/prqlc/prql-compiler/Cargo.toml b/prqlc/prql-compiler/Cargo.toml index 54fef4257036..4ceb30d9c809 100644 --- a/prqlc/prql-compiler/Cargo.toml +++ b/prqlc/prql-compiler/Cargo.toml @@ -14,7 +14,7 @@ version.workspace = true metadata.msrv = "1.70.0" [dependencies] -prqlc = {path = "../prqlc", version = "0.12.0", default-features = false} +prqlc = {path = "../prqlc", version = "0.12.1", default-features = false} [lib] doctest = false diff --git a/prqlc/prqlc-parser/Cargo.toml b/prqlc/prqlc-parser/Cargo.toml index 0d259b24eaf3..80b29e70a30a 100644 --- a/prqlc/prqlc-parser/Cargo.toml +++ b/prqlc/prqlc-parser/Cargo.toml @@ -12,7 +12,7 @@ version.workspace = true doctest = false [dependencies] -prqlc-ast = {path = "../prqlc-ast", version = "0.12.0" } +prqlc-ast = {path = "../prqlc-ast", version = "0.12.1" } serde = {workspace = true} serde_yaml = {workspace = true, optional = true} semver = {version = "1.0.23", features = ["serde"]} diff --git a/prqlc/prqlc/Cargo.toml b/prqlc/prqlc/Cargo.toml index 255ddabcb5c9..fcbdf3aa32f0 100644 --- a/prqlc/prqlc/Cargo.toml +++ b/prqlc/prqlc/Cargo.toml @@ -40,8 +40,8 @@ test-dbs = ["anyhow", "duckdb", "glob", "rusqlite", "tokio"] test-dbs-external = ["anyhow", "duckdb", "glob", "mysql", "pg_bigdecimal", "postgres", "rusqlite", "tiberius", "tokio", "tokio-util"] [dependencies] -prqlc-parser = {path = "../prqlc-parser"} -prqlc-ast = {path = "../prqlc-ast"} +prqlc-ast = {path = "../prqlc-ast", version = "0.12.1"} +prqlc-parser = {path = "../prqlc-parser", version = "0.12.1"} anstream = {version = "0.6.14", features = ["auto"]} ariadne = "0.4.1" diff --git a/prqlc/prqlc/src/cli/docs_generator.rs b/prqlc/prqlc/src/cli/docs_generator.rs index 0b332ea52b97..d0e6bb405e01 100644 --- a/prqlc/prqlc/src/cli/docs_generator.rs +++ b/prqlc/prqlc/src/cli/docs_generator.rs @@ -404,7 +404,7 @@ mod tests { - Generated with [prqlc](https://prql-lang.org/) 0.12.0. + Generated with [prqlc](https://prql-lang.org/) 0.12.1. ----- stderr ----- "###); diff --git a/prqlc/prqlc/tests/integration/sql.rs b/prqlc/prqlc/tests/integration/sql.rs index 6481fdd68c13..03652547fbb7 100644 --- a/prqlc/prqlc/tests/integration/sql.rs +++ b/prqlc/prqlc/tests/integration/sql.rs @@ -4336,7 +4336,7 @@ fn prql_version() { "#).unwrap(),@r###" SELECT *, - '0.12.0' AS y + '0.12.1' AS y FROM x "###); @@ -4348,7 +4348,7 @@ fn shortest_prql_version() { assert_snapshot!(compile(r#"[{version = prql.version}]"#).unwrap(),@r###" WITH table_0 AS ( SELECT - '0.12.0' AS version + '0.12.1' AS version ) SELECT version diff --git a/web/book/src/project/target.md b/web/book/src/project/target.md index 0c26245e0a4f..a1d2379e8a68 100644 --- a/web/book/src/project/target.md +++ b/web/book/src/project/target.md @@ -80,7 +80,7 @@ echo 'prql target:sql.generic PRQL allows specifying a version of the language in the PRQL header, like: ```prql -prql version:"0.12.0" +prql version:"0.12.1" from employees ``` diff --git a/web/book/tests/documentation/snapshots/documentation__book__project__target__version__1.snap b/web/book/tests/documentation/snapshots/documentation__book__project__target__version__1.snap index 1e8e3a1242d6..6580d6afc303 100644 --- a/web/book/tests/documentation/snapshots/documentation__book__project__target__version__1.snap +++ b/web/book/tests/documentation/snapshots/documentation__book__project__target__version__1.snap @@ -4,7 +4,7 @@ expression: "[{version = prql.version}]\n" --- WITH table_0 AS ( SELECT - '0.12.0' AS version + '0.12.1' AS version ) SELECT version diff --git a/web/playground/package-lock.json b/web/playground/package-lock.json index af37b1ef8fcb..dd48f0a3b770 100644 --- a/web/playground/package-lock.json +++ b/web/playground/package-lock.json @@ -1,12 +1,12 @@ { "name": "prql-playground", - "version": "0.12.0", + "version": "0.12.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "prql-playground", - "version": "0.12.0", + "version": "0.12.1", "dependencies": { "@duckdb/duckdb-wasm": "^1.28.0", "@monaco-editor/react": "^4.6.0", @@ -30,7 +30,7 @@ }, "../../prqlc/bindings/js": { "name": "prql-js", - "version": "0.12.0", + "version": "0.12.1", "license": "Apache-2.0", "devDependencies": { "chai": "^5.0.0", diff --git a/web/playground/package.json b/web/playground/package.json index 9953ab499ea4..c4f0c2dd8cfb 100644 --- a/web/playground/package.json +++ b/web/playground/package.json @@ -47,5 +47,5 @@ "prepare": "rsync -ai --checksum --delete ../../prqlc/prqlc/tests/integration/data/ public/data/ && node generateBook.cjs", "preview": "vite preview" }, - "version": "0.12.0" + "version": "0.12.1" }