diff --git a/Cargo.lock b/Cargo.lock index cf52072cab03..9ab3d5af3278 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -620,7 +620,7 @@ dependencies = [ [[package]] name = "compile-files" -version = "0.6.0" +version = "0.6.1" dependencies = [ "prql-compiler", ] @@ -1606,7 +1606,7 @@ dependencies = [ [[package]] name = "mdbook-prql" -version = "0.6.0" +version = "0.6.1" dependencies = [ "anyhow", "clap 4.1.6", @@ -2109,7 +2109,7 @@ dependencies = [ [[package]] name = "prql" -version = "0.6.0" +version = "0.6.1" dependencies = [ "prql-compiler", "rustler", @@ -2117,7 +2117,7 @@ dependencies = [ [[package]] name = "prql-compiler" -version = "0.6.0" +version = "0.6.1" dependencies = [ "anyhow", "ariadne", @@ -2148,7 +2148,7 @@ dependencies = [ [[package]] name = "prql-compiler-macros" -version = "0.6.0" +version = "0.6.1" dependencies = [ "prql-compiler", "syn", @@ -2156,7 +2156,7 @@ dependencies = [ [[package]] name = "prql-java" -version = "0.6.0" +version = "0.6.1" dependencies = [ "jni", "prql-compiler", @@ -2164,7 +2164,7 @@ dependencies = [ [[package]] name = "prql-js" -version = "0.6.0" +version = "0.6.1" dependencies = [ "console_error_panic_hook", "prql-compiler", @@ -2174,7 +2174,7 @@ dependencies = [ [[package]] name = "prql-lib" -version = "0.6.0" +version = "0.6.1" dependencies = [ "libc", "prql-compiler", @@ -2183,7 +2183,7 @@ dependencies = [ [[package]] name = "prql-python" -version = "0.6.0" +version = "0.6.1" dependencies = [ "insta", "prql-compiler", @@ -2193,7 +2193,7 @@ dependencies = [ [[package]] name = "prqlc" -version = "0.6.0" +version = "0.6.1" dependencies = [ "anyhow", "ariadne", diff --git a/Cargo.toml b/Cargo.toml index 0f937c56304b..30d13c22c079 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,15 +1,21 @@ [workspace] members = [ - "prql-compiler", - "prql-compiler/examples/compile-files", - "prql-compiler/prql-compiler-macros", - "prql-compiler/prqlc", + # The main crate + "prql-compiler", # + # The CLI + "prql-compiler/prqlc", # + # Macros + "prql-compiler/prql-compiler-macros", # + # An example + "prql-compiler/examples/compile-files", # + # Bindings + "bindings/prql-elixir/native/prql", "bindings/prql-java", - "bindings/prql-lib", "bindings/prql-js", - "bindings/prql-python", + "bindings/prql-lib", + "bindings/prql-python", # + # The book / docs "web/book", - "bindings/prql-elixir/native/prql", ] # Note we don't have a `default-members = ["prql-compiler"]`, since that causes # commands like `cargo test` to only run tests from the default package. And @@ -21,7 +27,7 @@ edition = "2021" license = "Apache-2.0" repository = "https://github.com/PRQL/prql" rust-version = "1.65.0" -version = "0.6.0" +version = "0.6.1" [profile.release.package.prql-js] # Tell `rust-js` to optimize for small code size. @@ -30,4 +36,3 @@ opt-level = "s" [workspace.metadata.release] allow-branch = ["*"] consolidate-commits = true -pre-release-commit-message = "chore: Release {{version}}" diff --git a/bindings/prql-elixir/native/prql/Cargo.toml b/bindings/prql-elixir/native/prql/Cargo.toml index 7eee02890463..76e536e96fe0 100644 --- a/bindings/prql-elixir/native/prql/Cargo.toml +++ b/bindings/prql-elixir/native/prql/Cargo.toml @@ -16,7 +16,7 @@ name = "prql" path = "src/lib.rs" [dependencies] -prql-compiler = {path = "../../../../prql-compiler", default-features = false, version = "0.6.0"} +prql-compiler = {path = "../../../../prql-compiler", default-features = false, version = "0.6.1" } # See Readme for details on Mac [target.'cfg(not(any(target_family="wasm", target_os = "macos")))'.dependencies] diff --git a/bindings/prql-js/Cargo.toml b/bindings/prql-js/Cargo.toml index bc44373f6ef0..b0c8cf259dbe 100644 --- a/bindings/prql-js/Cargo.toml +++ b/bindings/prql-js/Cargo.toml @@ -62,6 +62,6 @@ search = '(\s+"prql-js",)\n(\s+"version": )"[\d\.]+"' [[package.metadata.release.pre-release-replacements]] exactly = 1 -file = "../playground/package-lock.json" +file = "../../web/playground/package-lock.json" replace = '''$1"{{version}}"''' search = '( "../prql-js": \{\n "version": )"[\d\.]+"' diff --git a/bindings/prql-js/package-lock.json b/bindings/prql-js/package-lock.json index 7e5cbb4f9287..025d9190129d 100644 --- a/bindings/prql-js/package-lock.json +++ b/bindings/prql-js/package-lock.json @@ -1,12 +1,12 @@ { "name": "prql-js", - "version": "0.6.0", + "version": "0.6.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "prql-js", - "version": "0.6.0", + "version": "0.6.1", "license": "Apache-2.0", "devDependencies": { "chai": "^4.3.6", diff --git a/bindings/prql-js/package.json b/bindings/prql-js/package.json index 43876e7d3daf..b20e185bd64d 100644 --- a/bindings/prql-js/package.json +++ b/bindings/prql-js/package.json @@ -24,5 +24,5 @@ "test": "mocha tests" }, "types": "dist/node/prql_js.d.ts", - "version": "0.6.0" + "version": "0.6.1" } diff --git a/prql-compiler/Cargo.toml b/prql-compiler/Cargo.toml index b28ada516f55..5cea1a4342f8 100644 --- a/prql-compiler/Cargo.toml +++ b/prql-compiler/Cargo.toml @@ -61,6 +61,6 @@ name = "bench" # to `prql-compiler`? We can place it there when that's fixed. [[package.metadata.release.pre-release-replacements]] exactly = 1 -file = "../book/src/language-features/target.md" +file = "../web/book/src/language-features/target.md" replace = 'prql version:"{{version}}"' search = 'prql version:"[\d.]+"' diff --git a/prql-compiler/prql-compiler-macros/Cargo.toml b/prql-compiler/prql-compiler-macros/Cargo.toml index d80e788df0ae..b83c4ea33d55 100644 --- a/prql-compiler/prql-compiler-macros/Cargo.toml +++ b/prql-compiler/prql-compiler-macros/Cargo.toml @@ -14,7 +14,7 @@ proc_macro = true test = false [dependencies] -prql-compiler = {path = "..", default-features = false, version = "0.6.0" } +prql-compiler = {path = "..", default-features = false, version = "0.6.1" } # Was getting build errors with more recent versions; can remove pin if it # successfully builds. syn = "=1.0.107" diff --git a/prql-compiler/prqlc/Cargo.toml b/prql-compiler/prqlc/Cargo.toml index 522f9776aa84..e95f5a281877 100644 --- a/prql-compiler/prqlc/Cargo.toml +++ b/prql-compiler/prqlc/Cargo.toml @@ -19,7 +19,7 @@ env_logger = {version = "0.10.0", features = ["color"]} itertools = "0.10.3" minijinja = {version = "0.30.4", features = ["unstable_machinery"]} notify = "^5.1.0" -prql-compiler = {path = '..', version = "0.6.0" } +prql-compiler = {path = '..', version = "0.6.1" } regex = {version = "1.7.1", features = ["std", "unicode"]} serde = "^1" serde_json = "1.0.81" diff --git a/web/book/src/language-features/target.md b/web/book/src/language-features/target.md index aef5fc914274..9a7a87391457 100644 --- a/web/book/src/language-features/target.md +++ b/web/book/src/language-features/target.md @@ -48,7 +48,7 @@ very welcome. PRQL allows specifying a version of the language in the PRQL header, like: ```prql_no_fmt -prql version:"0.6.0" +prql version:"0.6.1" from employees ``` diff --git a/web/playground/package-lock.json b/web/playground/package-lock.json index 506ad981ccd1..890656b3512f 100644 --- a/web/playground/package-lock.json +++ b/web/playground/package-lock.json @@ -45,7 +45,7 @@ } }, "../prql-js": { - "version": "0.6.0", + "version": "0.6.1", "extraneous": true, "license": "Apache-2.0", "devDependencies": {